diff --git a/scripts/avahi_startup.sh b/scripts/avahi_startup.sh
index d186e3b..00ce579 100644
--- a/scripts/avahi_startup.sh
+++ b/scripts/avahi_startup.sh
@@ -1,15 +1,12 @@
 #!/bin/sh
 
-<<<<<<< refs/remotes/origin/master
 if [ -f /var/run/dbus/pid ];
 then
   rm -f /var/run/dbus/pid
 fi
 
-=======
 echo 'Preparing...'
 rm /var/run/dbus/pid
->>>>>>> fix
 dbus-daemon --system
 
 echo 'Restarting...'