diff --git a/Extensions.sln b/Extensions.sln
index ff5b47e72d4..7066ec41034 100644
--- a/Extensions.sln
+++ b/Extensions.sln
@@ -1616,7 +1616,6 @@ Global
 		{97AE13C4-B72C-4E30-8835-FF1603A9E224}.Release|x64.Build.0 = Release|Any CPU
 		{97AE13C4-B72C-4E30-8835-FF1603A9E224}.Release|x86.ActiveCfg = Release|Any CPU
 		{97AE13C4-B72C-4E30-8835-FF1603A9E224}.Release|x86.Build.0 = Release|Any CPU
-<<<<<<< HEAD
 		{1A203DA9-D706-4094-B549-2611C6DA38F4}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{1A203DA9-D706-4094-B549-2611C6DA38F4}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{1A203DA9-D706-4094-B549-2611C6DA38F4}.Debug|x64.ActiveCfg = Debug|Any CPU
@@ -1629,7 +1628,6 @@ Global
 		{1A203DA9-D706-4094-B549-2611C6DA38F4}.Release|x64.Build.0 = Release|Any CPU
 		{1A203DA9-D706-4094-B549-2611C6DA38F4}.Release|x86.ActiveCfg = Release|Any CPU
 		{1A203DA9-D706-4094-B549-2611C6DA38F4}.Release|x86.Build.0 = Release|Any CPU
-=======
 		{AC33A64E-1261-47E7-8676-69C48E4B0266}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{AC33A64E-1261-47E7-8676-69C48E4B0266}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{AC33A64E-1261-47E7-8676-69C48E4B0266}.Debug|x64.ActiveCfg = Debug|Any CPU
@@ -1666,7 +1664,6 @@ Global
 		{9FE05F36-5626-416D-956D-5C4C6D7E3E1B}.Release|x64.Build.0 = Release|Any CPU
 		{9FE05F36-5626-416D-956D-5C4C6D7E3E1B}.Release|x86.ActiveCfg = Release|Any CPU
 		{9FE05F36-5626-416D-956D-5C4C6D7E3E1B}.Release|x86.Build.0 = Release|Any CPU
->>>>>>> release/2.1
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE