diff --git a/scripts/avahi_startup.sh b/scripts/avahi_startup.sh
index 75d9266..d186e3b 100644
--- a/scripts/avahi_startup.sh
+++ b/scripts/avahi_startup.sh
@@ -1,10 +1,15 @@
 #!/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...'