diff --git a/code/controllers/subsystems/nanoui.dm b/code/controllers/subsystems/nanoui.dm
index 4aab9a5f25..520973514d 100644
--- a/code/controllers/subsystems/nanoui.dm
+++ b/code/controllers/subsystems/nanoui.dm
@@ -25,15 +25,9 @@ SUBSYSTEM_DEF(nanoui)
 			if(copytext(filename, length(filename)) != "/") // filenames which end in "/" are actually directories, which we want to ignore
 				if(fexists(path + filename))
 					asset_files.Add(fcopy_rsc(path + filename)) // add this file to asset_files for sending to clients when they connect
-<<<<<<< HEAD
-	.=..()					//VOREStation Edit start: fixing some kevinzing
-	for(var/i in GLOB.clients)
-		send_resources(i)	//VOREStation Edit end: fixing some kevinzing
-=======
 	.=..()
 	for(var/i in GLOB.clients)
 		send_resources(i)
->>>>>>> 2358af9... Merge pull request #6151 from Novacat/nova-runtimes
 
 /datum/controller/subsystem/nanoui/Recover()
 	if(SSnanoui.open_uis)
@@ -56,4 +50,4 @@ SUBSYSTEM_DEF(nanoui)
 	if(!subsystem_initialized)
 		return
 	for(var/file in asset_files)
-		client << browse_rsc(file)	// send the file to the client
\ No newline at end of file
+		client << browse_rsc(file)	// send the file to the client