diff --git a/PCSX2_suite.sln b/PCSX2_suite.sln
index a13c92746c..26e5f0ea83 100644
--- a/PCSX2_suite.sln
+++ b/PCSX2_suite.sln
@@ -612,10 +612,6 @@ Global
 		{12728250-16EC-4DC6-94D7-E21DD88947F8} = {78EBE642-7A4D-4EA7-86BE-5639C6646C38}
 	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
-<<<<<<< HEAD
 		SolutionGuid = {0BC474EA-3628-45D3-9DBC-E22D0B7E0F77}
-=======
-		SolutionGuid = {E0DF661E-BE9A-4467-A034-16AA535A1CB5}
->>>>>>> CDVD: merging and removing remnants of plugin
 	EndGlobalSection
 EndGlobal