diff --git a/version.txt b/version.txt
index aae3e30..26e4390 100644
--- a/version.txt
+++ b/version.txt
@@ -1,5 +1 @@
-<<<<<<< HEAD
-38 Year Of the Noodle Dragon
-=======
-37 Year Of the Noodle Dragon
->>>>>>> c8562cc676ebda86e0357d4888d9d576421d53e3
+38 Year Of the Noodle Dragon
\ No newline at end of file