diff --git a/config/maps.txt b/config/maps.txt
index 1315a707469..9ed4a832ff1 100644
--- a/config/maps.txt
+++ b/config/maps.txt
@@ -84,7 +84,6 @@ map serenitystation
 	votable
 endmap
 
-<<<<<<< HEAD
 ##FF MAPS##
 map kilostation2
 	maxplayers 50
@@ -93,8 +92,5 @@ endmap
 
 map nssjourney
 	maxplayers 100
-=======
-map snowglobe
->>>>>>> 8b771c19a8d (Snowglobe Station - A new icemoon station for nova! (#3207))
 	votable
 endmap