diff --git a/code/modules/mob/living/silicon/pai/pai.dm b/code/modules/mob/living/silicon/pai/pai.dm
index 71f415722c4..b6d4052a5fd 100644
--- a/code/modules/mob/living/silicon/pai/pai.dm
+++ b/code/modules/mob/living/silicon/pai/pai.dm
@@ -35,13 +35,8 @@
 		"Fox" = "pai-fox",
 		"Parrot" = "pai-parrot",
 		"Rabbit" = "pai-rabbit",
-<<<<<<< Updated upstream
-		"Bear" = "pai-bear"  //VOREStation Edit
-		"Fennec" = "pai-fennec" // VOREStation Edit - Rykka
-=======
 		"Bear" = "pai-bear",  //VOREStation Edit
 		"Fennec" = "pai-fen" // VOREStation Edit - Rykka
->>>>>>> Stashed changes
 		)
 
 	var/global/list/possible_say_verbs = list(