Fix merge error

Author: gmarz

src/Tests/Nest.Tests.Integration/Nest.Tests.Integration.csproj

@@ -174,11 +174,6 @@
     <Compile Include="Indices\StatsTests.cs" />
     <Compile Include="Core\AsyncTests.cs" />
     <Compile Include="Mapping\MappingVisitorTests.cs" />
-<<<<<<< HEAD
-    <Compile Include="Reproduce\Reproduce953Tests.cs" />
-    <Compile Include="Reproduce\Reproduce945Tests.cs" />
-=======
->>>>>>> 1.2.2
     <Compile Include="Reproduce\Reproduce769Tests.cs" />
     <Compile Include="Reproduce\Reproduce945Tests.cs" />
     <Compile Include="Reproduce\Reproduce953Tests.cs" />