diff --git a/code/modules/admin/admin_verbs.dm b/code/modules/admin/admin_verbs.dm
index 876f2972a0..2142c1e714 100644
--- a/code/modules/admin/admin_verbs.dm
+++ b/code/modules/admin/admin_verbs.dm
@@ -372,11 +372,7 @@ var/list/admin_verbs_event_manager = list(
 
 /client/proc/add_admin_verbs()
 	if(holder)
-<<<<<<< HEAD
 		control_freak = CONTROL_FREAK_ALL | CONTROL_FREAK_SKIN | CONTROL_FREAK_MACROS  //CHOMPedit KSC 1/30/20 - This enables Admins to use Macros and change use custom skins.
-=======
-		control_freak = CONTROL_FREAK_ALL | CONTROL_FREAK_SKIN | CONTROL_FREAK_MACROS  ////CM add Ksc 1/30/20 - This enables Admins to use Macros and change use custom skins.
->>>>>>> MacroFix
 		verbs += admin_verbs_default
 		if(holder.rights & R_BUILDMODE)		verbs += /client/proc/togglebuildmodeself
 		if(holder.rights & R_ADMIN)			verbs += admin_verbs_admin
diff --git a/code/modules/client/client defines.dm b/code/modules/client/client defines.dm
index 0596fdd08c..da5d374614 100644
--- a/code/modules/client/client defines.dm	
+++ b/code/modules/client/client defines.dm	
@@ -58,8 +58,4 @@
 
 	var/global/obj/screen/click_catcher/void
 
-<<<<<<< HEAD
-	control_freak = CONTROL_FREAK_ALL | CONTROL_FREAK_SKIN | CONTROL_FREAK_MACROS //CHOMPedit KSC 1/30/20 - This enables Admins to use Macros and change use custom skins. add Ksc 1/30/20 - This enables Players to use Macros and change use custom skins.
-=======
-	control_freak = CONTROL_FREAK_ALL | CONTROL_FREAK_SKIN | CONTROL_FREAK_MACROS //CH add Ksc 1/30/20 - This enables Players to use Macros and change use custom skins.
->>>>>>> MacroFix
+	control_freak = CONTROL_FREAK_ALL | CONTROL_FREAK_SKIN | CONTROL_FREAK_MACROS //CHOMPedit KSC 1/30/20 - This enables Admins to use Macros and change use custom skins. add Ksc 1/30/20 - This enables Players to use Macros and change use custom skins.
\ No newline at end of file