diff --git a/docker-compose.yml b/docker-compose.yml
index 748bc65..beea4af 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -37,7 +37,11 @@ promdash:
     - /tmp/prom:/tmp/prom
   environment:
     - "DATABASE_URL=sqlite3:/tmp/prom/file.sqlite3"
+<<<<<<< HEAD
   name: "promdash"
+=======
+  name: promdash
+>>>>>>> 8fd61f32ac17388fe8505e41ddbd2fb91babe945
 
 cadvisor:
   image: "google/cadvisor"
@@ -50,4 +54,8 @@ cadvisor:
     - "8080:8080"
   expose:
     - "8080"
+<<<<<<< HEAD
   name: "cadvisor"
+=======
+  name: cadvisor
+>>>>>>> 8fd61f32ac17388fe8505e41ddbd2fb91babe945
diff --git a/prom/prometheus.yml b/prom/prometheus.yml
index a928480..3b587fe 100644
--- a/prom/prometheus.yml
+++ b/prom/prometheus.yml
@@ -14,7 +14,7 @@ rule_files:
   # - "first.rules"
   # - "second.rules"
 
-# A scrape configuration containing exactly one endpoint to scrape: 
+# A scrape configuration containing exactly one endpoint to scrape:
 # Here it's Prometheus itself.
 scrape_configs:
   # The job name is added as a label `job=<job_name>` to any timeseries scraped from this config.