diff --git a/core/deps/libwebsocket/lws-plat-win.c b/core/deps/libwebsocket/lws-plat-win.c
index ef25eb0d3..d9c40fdea 100644
--- a/core/deps/libwebsocket/lws-plat-win.c
+++ b/core/deps/libwebsocket/lws-plat-win.c
@@ -362,4 +362,4 @@ lws_plat_inet_ntop(int af, const void *src, char *dst, int cnt)
 	return ok ? dst : NULL;
 }
 
-#endif
\ No newline at end of file
+#endif
diff --git a/shell/reicast.vcxproj.filters b/shell/reicast.vcxproj.filters
index d6aae57df..76a6affc1 100644
--- a/shell/reicast.vcxproj.filters
+++ b/shell/reicast.vcxproj.filters
@@ -509,9 +509,12 @@
     <Filter Include="deps\libwebsocket">
       <UniqueIdentifier>{3d3de3ff-9e79-4920-a95a-61d190e73004}</UniqueIdentifier>
     </Filter>
+<<<<<<< HEAD
     <Filter Include="webui">
       <UniqueIdentifier>{81193efc-656a-4154-9adf-146856d4c7d3}</UniqueIdentifier>
     </Filter>
+=======
+>>>>>>> add libwebsocket
   </ItemGroup>
   <ItemGroup>
     <ClInclude Include="..\core\hw\aica\aica.h">
@@ -856,9 +859,12 @@
     <ClInclude Include="..\core\deps\libwebsocket\private-libwebsockets.h">
       <Filter>deps\libwebsocket</Filter>
     </ClInclude>
+<<<<<<< HEAD
     <ClInclude Include="..\core\webui\server.h">
       <Filter>webui</Filter>
     </ClInclude>
+=======
+>>>>>>> add libwebsocket
   </ItemGroup>
   <ItemGroup>
     <None Include="..\core\deps\zlib\Makefile">