diff --git a/initpost.sh b/initpost.sh
index 183651c59..613d77bd6 100755
--- a/initpost.sh
+++ b/initpost.sh
@@ -63,11 +63,7 @@ if [[ "${1}" == "-p" || "${1}" == "--publish" ]]; then
 fi
 
 # Set your blog URL
-<<<<<<< HEAD
-BLOG_URL="http://vsential.com"
-=======
 BLOG_URL="your_site"
->>>>>>> gh-pages
 
 # Set your assets URL
 ASSETS_URL="assets/img/"