diff --git a/Code/Network/NetworkDependencies/NetworkDependencies.vcxproj.filters b/Code/Network/NetworkDependencies/NetworkDependencies.vcxproj.filters
index d3c0b9e5..083f7a1d 100644
--- a/Code/Network/NetworkDependencies/NetworkDependencies.vcxproj.filters
+++ b/Code/Network/NetworkDependencies/NetworkDependencies.vcxproj.filters
@@ -30,16 +30,10 @@
     <ClInclude Include="OysterByte.h" />
     <ClInclude Include="IPostBox.h" />
     <ClInclude Include="PostBox.h" />
-<<<<<<< HEAD
     <ClInclude Include="IClient.h" />
     <ClInclude Include="ThreadedClient.h" />
-=======
-<<<<<<< HEAD
     <ClInclude Include="Messages\MessagePlayerPos.h" />
-=======
     <ClInclude Include="IClient.h" />
     <ClInclude Include="ThreadedClient.h" />
->>>>>>> Client interface and class for both server and client. now using postbox system
->>>>>>> 10c1dc57f3c9235ca6c6d4e69fed43465daa7752
   </ItemGroup>
 </Project>
\ No newline at end of file