diff --git a/code/controllers/configuration/entries/game_options.dm b/code/controllers/configuration/entries/game_options.dm
index 6a2c3e0f59..84ba01fa7b 100644
--- a/code/controllers/configuration/entries/game_options.dm
+++ b/code/controllers/configuration/entries/game_options.dm
@@ -288,8 +288,6 @@
 
 /datum/config_entry/flag/shift_time_realtime
 
-<<<<<<< HEAD
-
 //Cit changes - Adds config options for crew objectives and miscreants
 /datum/config_entry/flag/allow_crew_objectives
 
@@ -306,8 +304,7 @@
 /datum/config_entry/number/nightshift_finish
 	config_entry_value = 6
 //End of Cit changes
-=======
+
 /datum/config_entry/number/monkeycap
 	config_entry_value = 64
 	min_val = 0
->>>>>>> f988a13... Adds config for monkey cap (#38165)