diff --git a/code/modules/jobs/job_types/captain.dm b/code/modules/jobs/job_types/captain.dm
index 028a81cc84..906bd570b4 100755
--- a/code/modules/jobs/job_types/captain.dm
+++ b/code/modules/jobs/job_types/captain.dm
@@ -69,12 +69,8 @@ Head of Personnel
 	minimal_player_age = 10
 	exp_requirements = 180
 	exp_type = EXP_TYPE_CREW
-<<<<<<< HEAD
 //	exp_type_department = EXP_TYPE_SUPPLY - CITADEL CHANGE
-=======
-	exp_type_department = EXP_TYPE_SUPPLY
 	antag_rep = 16
->>>>>>> 937ad3a... Antagonist reputation system (#35485)
 
 	outfit = /datum/outfit/job/hop