diff --git a/Foundation/testsuite/TestSuite_vs120.vcxproj b/Foundation/testsuite/TestSuite_vs120.vcxproj
index ed2aecd49..c8de003b1 100644
--- a/Foundation/testsuite/TestSuite_vs120.vcxproj
+++ b/Foundation/testsuite/TestSuite_vs120.vcxproj
@@ -588,11 +588,6 @@
     <ClInclude Include="src\SimpleHashTableTest.h"/>
     <ClInclude Include="src\VarTest.h"/>
   </ItemGroup>
-<<<<<<< HEAD
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets"/>
   <ImportGroup Label="ExtensionTargets"/>
-=======
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
-  <ImportGroup Label="ExtensionTargets" />
->>>>>>> develop
 </Project>