Fixes conflicts

code/modules/mob/dead/observer/observer.dm

@@ -13,7 +13,7 @@ var/list/image/ghost_darkness_images = list() //this is a list of images for thi
 	density = 0
 	canmove = 0
 	alpha = 127
-	anchored = 1	//  don't get pushed around
+	move_resist = INFINITY	//  don't get pushed around
 	invisibility = INVISIBILITY_OBSERVER
 	var/can_reenter_corpse
 	var/bootime = 0

code/modules/mob/living/carbon/alien/larva/larva.dm

@@ -38,12 +38,9 @@
 		amount_grown = min(amount_grown + 1, max_grown)
 	..(amount)
 
-<<<<<<< HEAD
-=======
-/mob/living/carbon/alien/larva/start_pulling(atom/movable/AM, state, force = move_force, supress_message = FALSE)
+/mob/living/carbon/alien/larva/start_pulling(atom/movable/AM, force = move_force, supress_message = FALSE)
 	return
 
->>>>>>> Lots of edits, needs review
 /mob/living/carbon/alien/larva/ex_act(severity)
 	..()