diff --git a/code/modules/projectiles/guns/projectile.dm b/code/modules/projectiles/guns/projectile.dm
index edc28cc8f0..4769aef999 100644
--- a/code/modules/projectiles/guns/projectile.dm
+++ b/code/modules/projectiles/guns/projectile.dm
@@ -56,15 +56,9 @@
 		chambered = ammo_magazine.stored_ammo[ammo_magazine.stored_ammo.len]
 		if(handle_casings != HOLD_CASINGS)
 			ammo_magazine.stored_ammo -= chambered
-<<<<<<< HEAD
-			
-	var/mob/living/M = loc
-	if(istype(M))
-=======
 
 	var/mob/living/M = loc // TGMC Ammo HUD
 	if(istype(M)) // TGMC Ammo HUD
->>>>>>> 0cd26259eb... Merge pull request #14901 from KillianKirilenko/kk-guntweaks
 		M?.hud_used.update_ammo_hud(M, src)
 
 	if (chambered)
@@ -110,15 +104,9 @@
 
 	if(handle_casings != HOLD_CASINGS)
 		chambered = null
-<<<<<<< HEAD
-	
-	var/mob/living/M = loc 
-	if(istype(M)) 
-=======
 
 	var/mob/living/M = loc // TGMC Ammo HUD
 	if(istype(M)) // TGMC Ammo HUD
->>>>>>> 0cd26259eb... Merge pull request #14901 from KillianKirilenko/kk-guntweaks
 		M?.hud_used.update_ammo_hud(M, src)