diff --git a/code/modules/projectiles/guns/beam_rifle.dm b/code/modules/projectiles/guns/beam_rifle.dm
index f715870f88..c36a3c7d69 100644
--- a/code/modules/projectiles/guns/beam_rifle.dm
+++ b/code/modules/projectiles/guns/beam_rifle.dm
@@ -38,11 +38,7 @@
 	var/aiming_time = 12
 	var/aiming_time_fire_threshold = 5
 	var/aiming_time_left = 12
-<<<<<<< HEAD
-	var/aiming_time_increase_user_movement = 6
-=======
 	var/aiming_time_increase_user_movement = 3
->>>>>>> 64851d8... Moves projectile processing to a subsystem (#30599)
 	var/scoped_slow = 1
 	var/aiming_time_increase_angle_multiplier = 0.3
 	var/last_process = 0
@@ -253,15 +249,9 @@
 		return
 	check_user()
 	handle_zooming()
-<<<<<<< HEAD
-	aiming_time_left = min(0, aiming_time_left - (world.time - lastprocess))
-	aiming_beam(TRUE)
-	lastprocess = world.time
-=======
 	aiming_time_left = max(0, aiming_time_left - (world.time - last_process))
 	aiming_beam(TRUE)
 	last_process = world.time
->>>>>>> 64851d8... Moves projectile processing to a subsystem (#30599)
 
 /obj/item/gun/energy/beam_rifle/proc/check_user(automatic_cleanup = TRUE)
 	if(!istype(current_user) || !isturf(current_user.loc) || !(src in current_user.held_items) || current_user.incapacitated())	//Doesn't work if you're not holding it!