diff --git a/program_info/polymc.6.scd b/program_info/sneedmc.6.scd
similarity index 100%
rename from program_info/polymc.6.scd
rename to program_info/sneedmc.6.scd
diff --git a/program_info/sneedmc.manifest b/program_info/sneedmc.manifest
index 92e07f1a..51af6c39 100644
--- a/program_info/sneedmc.manifest
+++ b/program_info/sneedmc.manifest
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
 <assembly xmlns="urn:schemas-microsoft-com:asm.v1" manifestVersion="1.0" xmlns:asmv3="urn:schemas-microsoft-com:asm.v3">
   <assemblyIdentity name="SneedMC.Application.1" type="win32" version="1.0.0.0" />
->>>>>>> upstream/develop:program_info/polymc.manifest.in
   <trustInfo xmlns="urn:schemas-microsoft-com:asm.v3">
     <security>
       <requestedPrivileges>