diff --git a/app/__init__.py b/app/__init__.py
index e2c1e5f..3722a8d 100644
--- a/app/__init__.py
+++ b/app/__init__.py
@@ -18,6 +18,7 @@ def index():
     md_content = "# Welcome to my blog!\nThis is rendered from **Markdown**.\n##[test](http://localhost/test)"
     html_content = markdown.markdown(md_content)
     return html_content
+<<<<<<< HEAD
 @app.route("/api/vault-update") #webhook for vault updated
 def update_vault():
 # TODO SECURE THIS WITH SECRETTTTT or auth header
@@ -26,6 +27,9 @@ def update_vault():
 
 
 
+=======
+@app.route("/api/push") #webhook for vault updated
+>>>>>>> 399920b (updated compose)
 
 @app.route ("/<filename>") # renders a filename if not otherwise specified
 def render_post(filename):
diff --git a/compose.yml b/compose.yml
index 1ea83f5..8198edf 100755
--- a/compose.yml
+++ b/compose.yml
@@ -7,7 +7,7 @@ services:
         - obsidian_vault_token=bd8cd9301ae2c1c5bacfb3340492acb5e862686a
 
     ports:
-      - '80:80'
+      - '8188:80'
     volumes:
       - ./content:/content #public
       - ./public-vault:/vault #private