diff --git a/code/modules/vore/eating/bellymodes_vr.dm b/code/modules/vore/eating/bellymodes_vr.dm
index a797ab8172..0891acef3c 100644
--- a/code/modules/vore/eating/bellymodes_vr.dm
+++ b/code/modules/vore/eating/bellymodes_vr.dm
@@ -148,19 +148,6 @@
 					absorbed_count++
 			next_emote = world.time + (emote_time SECONDS)
 			for(var/mob/living/M in contents)
-<<<<<<< HEAD
-				if(digest_mode == DM_DIGEST && !M.digestable)
-					continue // don't give digesty messages to indigestible people
-
-				var/raw_message = pick(EL)
-				var/formatted_message
-				formatted_message = replacetext(raw_message, "%belly", lowertext(name))
-				formatted_message = replacetext(formatted_message, "%pred", owner)
-				formatted_message = replacetext(formatted_message, "%prey", english_list(contents))
-				formatted_message = replacetext(formatted_message, "%countprey", living_count)
-				formatted_message = replacetext(formatted_message, "%count", contents.len)
-				to_chat(M, "<span class='notice'>[formatted_message]</span>")
-=======
 				if(M.absorbed)
 					EL = emote_lists[DM_HOLD_ABSORBED]
 
@@ -183,7 +170,6 @@
 					formatted_message = replacetext(formatted_message, "%countprey", living_count)
 					formatted_message = replacetext(formatted_message, "%count", contents.len)
 					to_chat(M, "<span class='notice'>[formatted_message]</span>")
->>>>>>> b19948a0832... Merge pull request #12021 from Heroman3003/more-absorb-vore
 
 	if(to_update)
 		updateVRPanels()