diff --git a/homenetwork/swarm/start.sh b/homenetwork/swarm/start.sh
index 19cda51..1a62a81 100755
--- a/homenetwork/swarm/start.sh
+++ b/homenetwork/swarm/start.sh
@@ -1,6 +1,2 @@
-<<<<<<< HEAD
 docker stack deploy -c portainer-agent-stack.yml portainer
 docker stack deploy -c grafana.yml --with-registry-auth grafana
-=======
-docker stack deploy -c grafana.yml --with-registry-auth swarm
->>>>>>> c1168759d5f8fa78ce3d46865fda84673dfdb115