Fixing conflict and allowing export chatlog

code/modules/vchat/vchat_client.dm

@@ -382,9 +382,6 @@ var/to_chat_src
 /client/proc/vchat_export_log()
 	set name = "Export chatlog"
 	set category = "OOC"
-	
-	to_chat(usr, "<span class='warning'>This verb is temporarily disabled due to performance issues.</span>")	//CHOMPEdit
-	return 	//CHOMPEdit
 
 	if(chatOutput.broken)
 		to_chat(src, "<span class='warning'>Error: VChat isn't processing your messages!</span>")

code/modules/vore/eating/vore_vr.dm

@@ -207,23 +207,8 @@ V::::::V           V::::::VO:::::::OOO:::::::ORR:::::R     R:::::REE::::::EEEEEE
 		return FALSE
 
 	//Write it out
-<<<<<<< HEAD
-	if(fexists(path))
-		fdel(path) //Byond only supports APPENDING to files, not replacing.
-	text2file(json_to_file, path)
-||||||| parent of b4fb235ba3... Merge pull request #9246 from ShadowLarkens/vchat_export_optimization
-#ifdef RUST_G
-	call(RUST_G, "file_write")(json_to_file, path)
-#else
-	// Fall back to using old format if we are not using rust-g
-	if(fexists(path))
-		fdel(path) //Byond only supports APPENDING to files, not replacing.
-	text2file(json_to_file, path)
-#endif
-=======
 	rustg_file_write(json_to_file, path)
 
->>>>>>> b4fb235ba3... Merge pull request #9246 from ShadowLarkens/vchat_export_optimization
 	if(!fexists(path))
 		log_debug("Saving: [path] failed file write")
 		return FALSE