diff --git a/README.md b/README.md
index 42a92f5..866923a 100644
--- a/README.md
+++ b/README.md
@@ -2,7 +2,5 @@ Welcome to EasyWeb
 
 EasyWeb is a tool that simplifies the integration of your navigation bar, CSS, HTML, and JavaScript files into one convenient place.
 
-<<<<<<< HEAD
+
 to start run ezweb.py and connect to localhost:8080 on a web broser
-=======
->>>>>>> d425943 (added stuff i guess)