diff --git a/README.md b/README.md
index 871c4ac8..f278a86f 100644
--- a/README.md
+++ b/README.md
@@ -598,10 +598,6 @@ server.MapWebsocket("/chat", (request, client) =>
 server.Open(new Uri("http://localhost:8080"));
 ```
 
-<<<<<<< HEAD
 </details>
 
-<br/>
-=======
-<br/><hr/><br/>
->>>>>>> 022af06671f1aa974601925bb59699a662c2a045
+<br/>
\ No newline at end of file