diff --git a/motd.sh b/motd.sh
index 1854973..31f2064 100755
--- a/motd.sh
+++ b/motd.sh
@@ -1,10 +1,6 @@
 # Fancy waifu motd
 
-<<<<<<< HEAD
-MOTDPATH="$HOME/src/motd"          # path to motd folder
-=======
 MOTDPATH="$( cd -- "$(dirname "$0")" >/dev/null 2>&1 ; pwd -P )"          # path to motd folder
->>>>>>> 01b098ef55e85b9ed6e37c03428b18db0e93a44f
 CACHEFILE="/tmp/waifu.cache"          # to cache waifu state
 RESOLUTION=256                        # resolution of waifu
 CENTER=true                           # center motd?