diff --git a/.gitignore b/.gitignore
index 5865410..bcca001 100644
--- a/.gitignore
+++ b/.gitignore
@@ -145,5 +145,8 @@ dev/
 out/
 ref-test/testing.py
 
+# Ignore Database
+database/data/
+
 # Ignore Encryption Keyfile
 .encryption.key
\ No newline at end of file
diff --git a/docker-compose.yml b/docker-compose.yml
index abc942e..50d6222 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -22,11 +22,6 @@ services:
   ref_test_app:
     container_name: ref_test_app
     build: ./ref-test
-<<<<<<< HEAD
-    volumes:
-      - ./ref-test:/ref-test
-=======
->>>>>>> 9462d7aa7f14b379766503503fd3ba08e1469574
     env_file:
       - ./.env
     ports:
@@ -44,11 +39,7 @@ services:
     image: mongo:5.0.4-focal
     restart: unless-stopped
     volumes:
-<<<<<<< HEAD
-      - ./database/data:/data
-=======
       - ./database/data:/data/db
->>>>>>> 9462d7aa7f14b379766503503fd3ba08e1469574
       - ./database/initdb.d/:/docker-entrypoint-initdb.d/
     env_file:
       - ./.env
@@ -76,11 +67,7 @@ services:
       - ./src/html:/var/www/html
     depends_on:
       - ref_test_server
-<<<<<<< HEAD
-    # command: certonly --webroot --webroot-path=/var/www/html --email vsdomainmanager@gmail.com --agree-tos --no-eff-email -d reftest.vsnt.uk
-=======
     # command: certonly --webroot --webroot-path=/var/www/html --email (email) --agree-tos --no-eff-email -d (domain)
->>>>>>> 9462d7aa7f14b379766503503fd3ba08e1469574
   
 networks:
   frontend: