diff --git a/code/game/machinery/doppler_array.dm b/code/game/machinery/doppler_array.dm
index b5942bde56..084bb29591 100644
--- a/code/game/machinery/doppler_array.dm
+++ b/code/game/machinery/doppler_array.dm
@@ -109,20 +109,14 @@ GLOBAL_LIST_EMPTY(doppler_arrays)
 	. = ..()
 	if(!istype(linked_techweb))
 		say("Warning: No linked research system!")
-<<<<<<< HEAD
 		return
-	var/point_gain = techweb_scale_bomb(orig_light - 20 - linked_techweb.max_bomb_value)
-	if(!point_gain)
-=======
-		return
 	var/adjusted = orig_light - 10 - linked_techweb.max_bomb_value
 	if(adjusted <= 0)
 		say("Explosion not large enough for research calculations.")
 		return
 	var/point_gain = techweb_scale_bomb(adjusted)
 	if(point_gain <= 0)
-		say("Explosion not large enough for research calculations.")
->>>>>>> 08ed516... Changes doppler array point formula (#35383)
+		say("Explosion not large enough for research calculations.")
 		return
 	linked_techweb.max_bomb_value = orig_light - 10
 	linked_techweb.research_points += point_gain