diff --git a/number_utils.py b/number_utils.py
index 0232612..c7e20c5 100644
--- a/number_utils.py
+++ b/number_utils.py
@@ -3,3 +3,6 @@
 # more code for hw
 def is_even(n):
     return n % 2 == 0
+
+def is_odd(n):
+    return n % 2 != 0
diff --git a/temperature.py.orig b/temperature.py.orig
new file mode 100644
index 0000000..f5603d8
--- /dev/null
+++ b/temperature.py.orig
@@ -0,0 +1,10 @@
+#!/usr/bin/python3
+
+# dummy code for hw
+def to_celsius(fahrenheit):
+<<<<<<< HEAD
+    celsius = (fahrenheit - 32) * 5 / 9
+    return celsius
+=======
+    return round((fahrenheit - 32) * 5 / 9)
+>>>>>>> feature-temperature-format