diff --git a/README.md b/README.md
index ee08c37..42a92f5 100644
--- a/README.md
+++ b/README.md
@@ -2,4 +2,7 @@ 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)
diff --git a/ezweb b/ezweb
index 6ab9b17..b755daf 160000
--- a/ezweb
+++ b/ezweb
@@ -1 +1 @@
-Subproject commit 6ab9b17f8610d9462c1723d4379977c9aa524cd1
+Subproject commit b755daf3b2acbb7d6e713b07821c277135e977e6