diff --git a/code/modules/mob/camera/camera.dm b/code/modules/mob/camera/camera.dm
index f4705bdb18..9a95bc9a4a 100644
--- a/code/modules/mob/camera/camera.dm
+++ b/code/modules/mob/camera/camera.dm
@@ -1,20 +1,11 @@
-// Camera mob, used by AI camera and blob.
-
-/mob/camera
-	name = "camera mob"
+// Camera mob, used by AI camera and blob.
+
+/mob/camera
+	name = "camera mob"
 	density = FALSE
 	anchored = TRUE
-	status_flags = GODMODE  // You can't damage it.
+	status_flags = GODMODE  // You can't damage it.
 	mouse_opacity = MOUSE_OPACITY_TRANSPARENT
-<<<<<<< HEAD
-	see_in_dark = 7
-	invisibility = INVISIBILITY_ABSTRACT // No one can see us
-	sight = SEE_SELF
-	move_on_shuttle = 0
-
-/mob/camera/experience_pressure_difference()
-	return
-=======
 	see_in_dark = 7
 	invisibility = INVISIBILITY_ABSTRACT // No one can see us
 	sight = SEE_SELF
@@ -25,4 +16,3 @@
 
 /mob/camera/forceMove(atom/destination)
 	loc = destination
->>>>>>> 5233ec1... Finishes the forceMove port (#33519)