diff --git a/blueprints/imgproxy/docker-compose.yml b/blueprints/imgproxy/docker-compose.yml
index fc48f52d..b71ccf49 100644
--- a/blueprints/imgproxy/docker-compose.yml
+++ b/blueprints/imgproxy/docker-compose.yml
@@ -3,11 +3,8 @@ services:
   imgproxy:
     image: darthsim/imgproxy:v3.30.1
     restart: unless-stopped
-<<<<<<< HEAD
-=======
     expose:
       - 8080
->>>>>>> origin/canary
     environment:
       IMGPROXY_KEY: ${IMGPROXY_KEY}
       IMGPROXY_SALT: ${IMGPROXY_SALT}
diff --git a/blueprints/mediafetch/docker-compose.yml b/blueprints/mediafetch/docker-compose.yml
index f273f3b8..17ba6176 100644
--- a/blueprints/mediafetch/docker-compose.yml
+++ b/blueprints/mediafetch/docker-compose.yml
@@ -1,11 +1,7 @@
 version: "3.8"
 services:
   mediafetch:
-<<<<<<< HEAD
-    image: lukedunsmoto/mediafetch:latest
-=======
     image: lukedunsmoto/mediafetch:1.3.5
->>>>>>> origin/canary
     restart: unless-stopped
     expose:
       - "3002"
@@ -15,16 +11,11 @@ services:
       - PORT=3002
       - BASIC_AUTH_USER=${BASIC_AUTH_USER}
       - BASIC_AUTH_PASS=${BASIC_AUTH_PASS}
-<<<<<<< HEAD
-      - PUBLIC_BASE_URL=https://${DOMAIN}
-      - OUTPUT_DIR=/data/downloads
-=======
       - PUBLIC_BASE_URL=${PUBLIC_BASE_URL}
       - OUTPUT_DIR=${OUTPUT_DIR}
       - MAX_CONCURRENT_JOBS=${MAX_CONCURRENT_JOBS}
       - JOB_TIMEOUT_MS=${JOB_TIMEOUT_MS}
       - VERSION_CHECK_TTL_MS=${VERSION_CHECK_TTL_MS}
->>>>>>> origin/canary
 
 volumes:
   mediafetch_data:
\ No newline at end of file
diff --git a/blueprints/mediafetch/template.toml b/blueprints/mediafetch/template.toml
index 86eaaa3c..791bd07f 100644
--- a/blueprints/mediafetch/template.toml
+++ b/blueprints/mediafetch/template.toml
@@ -1,15 +1,4 @@
 [variables]
-<<<<<<< HEAD
-BASIC_AUTH_USER = "admin"
-BASIC_AUTH_PASS = "${password:12}"
-
-[config]
-[[config.domains]]
-name = "Domain"
-variable = "DOMAIN"
-serviceName = "mediafetch"
-port = 3002
-=======
 main_domain = "${domain}"
 PORT="3002"
 PUBLIC_BASE_URL="https://${main_domain}"
@@ -27,7 +16,6 @@ name = "Domain"
 serviceName = "mediafetch"
 port = "3002"
 host = "${main_domain}"
->>>>>>> origin/canary
 
 [[config.mounts]]
 name = "Downloads"
diff --git a/blueprints/nextcloud-aio/docker-compose.yml b/blueprints/nextcloud-aio/docker-compose.yml
index 111faabf..7550c252 100644
--- a/blueprints/nextcloud-aio/docker-compose.yml
+++ b/blueprints/nextcloud-aio/docker-compose.yml
@@ -13,8 +13,6 @@ services:
     depends_on:
       - nextcloud_db
       - nextcloud_redis
-<<<<<<< HEAD
-=======
 
   nextcloud_cron:
     image: nextcloud:stable
@@ -30,7 +28,6 @@ services:
     depends_on:
       - nextcloud_db
       - nextcloud_redis
->>>>>>> origin/canary
 
   nextcloud_db:
     image: mariadb:10.11
@@ -49,4 +46,4 @@ services:
 
 volumes:
   nextcloud_data:
-  nextcloud_db_data:
\ No newline at end of file
+  nextcloud_db_data: