Fixing again.

docker-compose.yml

@@ -1458,10 +1458,6 @@ services:
       grafana-alloy:
         condition: service_started
         required: true
-<<<<<<< HEAD
-        restart: true
-=======
->>>>>>> sonarqube-gitea-docker-compose-deploy
     environment:
       GF_INSTALL_PLUGINS: grafana-piechart-panel
       TZ: America/New_York
@@ -1570,10 +1566,6 @@ services:
       grafana-alloy:
         condition: service_started
         required: true
-<<<<<<< HEAD
-        restart: true
-=======
->>>>>>> sonarqube-gitea-docker-compose-deploy
     image: grafana/loki:latest
     networks:
       default: null
@@ -1598,10 +1590,6 @@ services:
       grafana-alloy:
         condition: service_started
         required: true
-<<<<<<< HEAD
-        restart: true
-=======
->>>>>>> sonarqube-gitea-docker-compose-deploy
     image: grafana/mimir:latest
     labels:
       - homepage.group=Infrastructure/App Performance Monitoring
@@ -1656,10 +1644,6 @@ services:
       grafana-alloy:
         condition: service_started
         required: true
-<<<<<<< HEAD
-        restart: true
-=======
->>>>>>> sonarqube-gitea-docker-compose-deploy
     image: grafana/pyroscope:latest
     labels:
       - homepage.group=Infrastructure/App Performance Monitoring
@@ -1689,10 +1673,6 @@ services:
       grafana-alloy:
         condition: service_started
         required: true
-<<<<<<< HEAD
-        restart: true
-=======
->>>>>>> sonarqube-gitea-docker-compose-deploy
     image: grafana/tempo:latest
     networks:
       default: null
@@ -4541,33 +4521,12 @@ services:
       - SYS_RAWIO
     container_name: scrutiny
     devices:
-<<<<<<< HEAD
-      - permissions: rwm
-        source: /dev/sda
-        target: /dev/sda
-      - permissions: rwm
-        source: /dev/sdb
-        target: /dev/sdb
-      - permissions: rwm
-        source: /dev/sdd
-        target: /dev/sdd
-      - permissions: rwm
-        source: /dev/sde
-        target: /dev/sde
-      - permissions: rwm
-        source: /dev/sdc
-        target: /dev/sdc
-      - permissions: rwm
-        source: /dev/sdf
-        target: /dev/sdf
-=======
       - "/dev/sda:/dev/sda:rwm"
       - "/dev/sdb:/dev/sdb:rwm"
       - "/dev/sdc:/dev/sdc:rwm"
       - "/dev/sdd:/dev/sdd:rwm"
       - "/dev/sde:/dev/sde:rwm"
       - "/dev/sdf:/dev/sdf:rwm"
->>>>>>> sonarqube-gitea-docker-compose-deploy
     image: ghcr.io/analogj/scrutiny:master-omnibus
     labels:
       - homepage.group=Infrastructure/App Performance Monitoring