diff --git a/configure.ac b/configure.ac
index 327e27866..cead7db89 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,8 +1,4 @@
-<<<<<<< HEAD
 AC_INIT(NI-Neutrino,3.40.0)
-=======
-AC_INIT(Tuxbox-Neutrino,3.5.0)
->>>>>>> 45f915dd390a68dc0fc702185e6d94bf5d156611
 AM_INIT_AUTOMAKE([1.0.1 nostdinc])
 m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES])