Fixed merge conflicts

lib/systemd/bridgehead-update@.service

@@ -1,23 +1,10 @@
-<<<<<<< HEAD
 [Unit]
 Description=Bridgehead (%i) Update Service
 
 [Service]
 Type=oneshot
-WorkingDirectory=/srv/docker/bridgehead/
-ExecStart=/bin/bash -c "/srv/docker/bridgehead/update-bridgehead.sh %i"
+User=bridgehead
+ExecStart=/srv/docker/bridgehead/bridgehead update %i
 
 [Install]
 WantedBy=multi-user.target
-=======
-[Unit]
-Description=Bridgehead (%i) Update Service
-
-[Service]
-Type=oneshot
-User=bridgehead
-ExecStart=/srv/docker/bridgehead/bridgehead update %i
-
-[Install]
-WantedBy=multi-user.target
->>>>>>> version-1

lib/systemd/bridgehead-update@.timer

@@ -1,4 +1,3 @@
-<<<<<<< HEAD
 [Unit]
 Description=Nightly Updates of Bridgehead (%i)
 
@@ -7,13 +6,3 @@ OnCalendar=*-*-* 03:00:00
 
 [Install]
 WantedBy=basic.target
-=======
-[Unit]
-Description=Nightly Updates of Bridgehead (%i)
-
-[Timer]
-OnCalendar=*-*-* 03:00:00
-
-[Install]
-WantedBy=basic.target
->>>>>>> version-1

lib/systemd/bridgehead@.service

@@ -1,30 +1,12 @@
-<<<<<<< HEAD
 [Unit]
 Description=Bridgehead (%i) Service
 
 [Service]
+User=bridgehead
 Restart=always
 RestartSec=30
-
-WorkingDirectory=/srv/docker/bridgehead/
-
-ExecStartPre=/bin/bash -c '`which docker-compose` -f %i/docker-compose.yml --env-file site-config/%i.env down'
-ExecStart=/bin/bash -c '`which docker-compose` -f %i/docker-compose.yml --env-file site-config/%i.env up'
-ExecStop=/bin/bash -c '`which docker-compose` -f %i/docker-compose.yml --env-file site-config/%i.env down'
+ExecStart=/srv/docker/bridgehead/bridgehead start %i
+ExecStop=/srv/docker/bridgehead/bridgehead stop %i
 
 [Install]
 WantedBy=multi-user.target
-=======
-[Unit]
-Description=Bridgehead (%i) Service
-
-[Service]
-User=bridgehead
-Restart=always
-RestartSec=30
-ExecStart=/srv/docker/bridgehead/bridgehead start %i
-ExecStop=/srv/docker/bridgehead/bridgehead stop %i
-
-[Install]
-WantedBy=multi-user.target
->>>>>>> version-1