diff --git a/code/game/machinery/doors/windowdoor.dm b/code/game/machinery/doors/windowdoor.dm
index 162df0d582..a1e05d5e1e 100644
--- a/code/game/machinery/doors/windowdoor.dm
+++ b/code/game/machinery/doors/windowdoor.dm
@@ -84,18 +84,10 @@
 		open()
 		addtimer(CALLBACK(src, .proc/close), check_access(null)? 50 : 20)
 
-<<<<<<< HEAD
-/obj/machinery/door/window/CanPass(atom/movable/mover, turf/target, height=0, air_group=0)
-	if(istype(mover) && mover.checkpass(PASSGLASS))
-		return 1
-	if(get_dir(mover, loc) == turn(dir, 180)) //Make sure looking at appropriate border
-		if(air_group) return 0
-=======
 /obj/machinery/door/window/CanPass(atom/movable/mover, turf/target)
 	if(istype(mover) && mover.checkpass(PASSGLASS))
 		return TRUE
 	if(get_dir(mover, loc) == turn(dir, 180)) //Make sure looking at appropriate border
->>>>>>> 4122c65... Merge pull request #5947 from Neerti/bump_fixes
 		return !density
 	return TRUE
 
diff --git a/code/game/objects/effects/spiders.dm b/code/game/objects/effects/spiders.dm
index bc8490b0f0..6ec90ced92 100644
--- a/code/game/objects/effects/spiders.dm
+++ b/code/game/objects/effects/spiders.dm
@@ -62,16 +62,9 @@
 		icon_state = "stickyweb2"
 	return ..()
 
-<<<<<<< HEAD
-/obj/effect/spider/stickyweb/CanPass(atom/movable/mover, turf/target, height=0, air_group=0)
-	if(air_group || (height==0)) return 1
-	if(istype(mover, /mob/living/simple_mob/animal/giant_spider))
-		return 1
-=======
 /obj/effect/spider/stickyweb/CanPass(atom/movable/mover, turf/target)
 	if(istype(mover, /mob/living/simple_mob/animal/giant_spider))
 		return TRUE
->>>>>>> 4122c65... Merge pull request #5947 from Neerti/bump_fixes
 	else if(istype(mover, /mob/living))
 		if(prob(50))
 			to_chat(mover, span("warning", "You get stuck in \the [src] for a moment."))
diff --git a/code/game/objects/items/weapons/policetape.dm b/code/game/objects/items/weapons/policetape.dm
index bce9b190f6..78065ff69e 100644
--- a/code/game/objects/items/weapons/policetape.dm
+++ b/code/game/objects/items/weapons/policetape.dm
@@ -290,17 +290,10 @@ var/list/tape_roll_applications = list()
 	if(!lifted && ismob(mover))
 		var/mob/M = mover
 		add_fingerprint(M)
-<<<<<<< HEAD
-		if (!allowed(M))	//only select few learn art of not crumpling the tape
-			M << "<span class='warning'>You are not supposed to go past [src]...</span>"
-			if(M.a_intent == I_HELP && !(istype(M, /mob/living/simple_mob)))
-				return 0
-=======
 		if(!allowed(M))	//only select few learn art of not crumpling the tape
 			to_chat(M, span("warning", "You are not supposed to go past \the [src]..."))
 			if(M.a_intent == I_HELP && !(istype(M, /mob/living/simple_mob)))
 				return FALSE
->>>>>>> 4122c65... Merge pull request #5947 from Neerti/bump_fixes
 			crumple()
 	return ..()
 
diff --git a/code/game/objects/structures/window.dm b/code/game/objects/structures/window.dm
index 1cf6c39e8a..8cae823659 100644
--- a/code/game/objects/structures/window.dm
+++ b/code/game/objects/structures/window.dm
@@ -130,17 +130,7 @@
 /obj/structure/window/blob_act()
 	take_damage(50)
 
-<<<<<<< HEAD
-//TODO: Make full windows a separate type of window.
-//Once a full window, it will always be a full window, so there's no point
-//having the same type for both.
-/obj/structure/window/proc/is_full_window()
-	return (dir == SOUTHWEST || dir == SOUTHEAST || dir == NORTHWEST || dir == NORTHEAST)
-
-/obj/structure/window/CanPass(atom/movable/mover, turf/target, height=0, air_group=0)
-=======
 /obj/structure/window/CanPass(atom/movable/mover, turf/target)
->>>>>>> 4122c65... Merge pull request #5947 from Neerti/bump_fixes
 	if(istype(mover) && mover.checkpass(PASSGLASS))
 		return TRUE
 	if(is_fulltile())
diff --git a/code/modules/tables/interactions.dm b/code/modules/tables/interactions.dm
index ab90115f5e..e28f54f9e4 100644
--- a/code/modules/tables/interactions.dm
+++ b/code/modules/tables/interactions.dm
@@ -1,10 +1,4 @@
-
-<<<<<<< HEAD
-/obj/structure/table/CanPass(atom/movable/mover, turf/target, height=0, air_group=0)
-	if(air_group || (height==0)) return 1
-=======
 /obj/structure/table/CanPass(atom/movable/mover, turf/target)
->>>>>>> 4122c65... Merge pull request #5947 from Neerti/bump_fixes
 	if(istype(mover,/obj/item/projectile))
 		return (check_cover(mover,target))
 	if (flipped == 1)