Change /srv/http/pages to /srv/http, resolve merge conflict

docker-compose.yml

@@ -39,14 +39,11 @@ services:
     image: docker.io/alpine/socat:latest
     command: "UNIX-LISTEN:/mnt/weblate,fork,mode=660 TCP4:weblate:8080"
     volumes:
-      - /srv/http/pages:/mnt
+      - /srv/http:/mnt
 volumes:
   weblate-cache: {}
   weblate-data: {}
   weblate-var: {}
-<<<<<<< HEAD
-=======
   weblate-backup: {}
->>>>>>> 007f1a5 (We're up)
   postgresql-data: {}
   redis-data: {}