diff --git a/version.num b/version.num
index 37e7ba980b2..5cd7ca2206d 100644
--- a/version.num
+++ b/version.num
@@ -1,5 +1 @@
-<<<<<<< HEAD
-748
-=======
-747
->>>>>>> da27db4c7d46e37d65c57d14c384b873ce4b94b3
+748
\ No newline at end of file