diff --git a/code/_onclick/pai.dm b/code/_onclick/pai.dm
index affc437c01d5..7d1fc253433c 100644
--- a/code/_onclick/pai.dm
+++ b/code/_onclick/pai.dm
@@ -1,10 +1,6 @@
 /mob/living/silicon/pai/ClickOn(var/atom/A, params)
-	if(aicamera.in_camera_mode)
+	..()
+	if(aicamera.in_camera_mode) //pAI picture taking
 		aicamera.camera_mode_off()
-<<<<<<< HEAD
-		aicamera.captureimage(A, usr)
-		return
-=======
 		aicamera.captureimage(A, usr, null, aicamera.picture_size_x, aicamera.picture_size_y)
-		return
->>>>>>> ade1a97e7c... [READY] pAI HUD Overhaul (#43741)
+		return
\ No newline at end of file