diff --git a/code/__HELPERS/cmp.dm b/code/__HELPERS/cmp.dm
index d4ec1651a1..dbb548a6a5 100644
--- a/code/__HELPERS/cmp.dm
+++ b/code/__HELPERS/cmp.dm
@@ -58,8 +58,6 @@ GLOBAL_VAR_INIT(cmp_field, "name")
 		. = B.failures - A.failures
 	if (!.)
 		. = B.qdels - A.qdels
-<<<<<<< HEAD
-=======
     
 /proc/cmp_profile_avg_time_dsc(list/A, list/B)
 	return (B[PROFILE_ITEM_TIME]/(B[PROFILE_ITEM_COUNT] || 1)) - (A[PROFILE_ITEM_TIME]/(A[PROFILE_ITEM_COUNT] || 1))
@@ -69,4 +67,3 @@ GLOBAL_VAR_INIT(cmp_field, "name")
 
 /proc/cmp_profile_count_dsc(list/A, list/B)
 	return B[PROFILE_ITEM_COUNT] - A[PROFILE_ITEM_COUNT]
->>>>>>> bf06d69... Merge pull request #32116 from MrStonedOne/line-by-line-profiling