diff --git a/code/modules/paperwork/photography.dm b/code/modules/paperwork/photography.dm
index 631e1e0842b..535debad21d 100644
--- a/code/modules/paperwork/photography.dm
+++ b/code/modules/paperwork/photography.dm
@@ -134,11 +134,7 @@ var/global/photo_count = 0
 	var/icon_on = "camera"
 	var/icon_off = "camera_off"
 	var/size = 3
-<<<<<<< HEAD
-	var/picture_planes = list()
-=======
 	var/list/picture_planes = list()
->>>>>>> 2a696db... Merge pull request #5385 from Mechoid/Camerafix
 
 /obj/item/device/camera/verb/change_size()
 	set name = "Set Photo Focus"
@@ -198,11 +194,7 @@ var/global/photo_count = 0
 	for(var/i; i <= sorted.len; i++)
 		var/atom/A = sorted[i]
 		if(A)
-<<<<<<< HEAD
 			var/icon/img = getFlatIcon(A)//, picture_planes = picture_planes)//build_composite_icon(A) //VOREStation Edit
-=======
-			var/icon/img = getFlatIcon(A, picture_planes)//build_composite_icon(A)
->>>>>>> 2a696db... Merge pull request #5385 from Mechoid/Camerafix
 
 			// If what we got back is actually a picture, draw it.
 			if(istype(img, /icon))