diff --git a/.xinitrc b/.xinitrc
index 8de9f49..c93f42a 100755
--- a/.xinitrc
+++ b/.xinitrc
@@ -1,9 +1,6 @@
 #!/bin/bash
 xmodmap ~/.Xmodmap
 
-<<<<<<< HEAD
-emacs --daemon &
-=======
 # Source scripts in /etc/X11/xinit/xinitrc.d/
 if [ -d /etc/X11/xinit/xinitrc.d ]; then
     for f in /etc/X11/xinit/xinitrc.d/*; do
@@ -12,8 +9,7 @@ if [ -d /etc/X11/xinit/xinitrc.d ]; then
     unset f
 fi
 
-{ emacs --daemon & } && sleep 1
->>>>>>> origin/master
+emacs --daemon &
 
 pidof mpdscribble >& /dev/null
 if [ $? -ne 0 ]