diff --git a/code/modules/client/client_defines.dm b/code/modules/client/client_defines.dm
index a7e3b20e7a..10d3866672 100644
--- a/code/modules/client/client_defines.dm
+++ b/code/modules/client/client_defines.dm
@@ -68,9 +68,6 @@
 
 	var/datum/chatOutput/chatOutput
 
-<<<<<<< HEAD
-=======
 	var/list/credits //lazy list of all credit object bound to this client
 
 	var/datum/player_details/player_details //these persist between logins/logouts during the same round.
->>>>>>> 3d81385... Roundend report refactor (#33246)