diff --git a/Left4Dead2/l4d2server b/Left4Dead2/l4d2server
index f19d17844..509907f13 100644
--- a/Left4Dead2/l4d2server
+++ b/Left4Dead2/l4d2server
@@ -3,11 +3,8 @@
 # Server Management Script
 # Author: Daniel Gibbs
 # Website: http://danielgibbs.co.uk
-<<<<<<< HEAD
 # Version: 251214
-=======
 # Version: 240114
->>>>>>> Major update 240114
 
 #### Variables ####