diff --git a/.bundle/config b/.bundle/config
new file mode 100644
index 0000000..c456542
--- /dev/null
+++ b/.bundle/config
@@ -0,0 +1,3 @@
+---
+BUNDLE_PATH: "/home/paul/.bundle"
+BUNDLE_DISABLE_SHARED_GEMS: "true"
diff --git a/_config.yml b/_config.yml
index bfcd383..e31d36f 100644
--- a/_config.yml
+++ b/_config.yml
@@ -5,15 +5,11 @@ gems: [jekyll-paginate]
paginate: 7
paginate_path: "page:num"
layout: post
-<<<<<<< HEAD
-#permalink: /:categories/:title
-=======
->>>>>>> c6a7f18e1ea48b44859aaeca0db0980c68c09690
permalink: pretty
excerpt_separator: "[-----]"
-#mode: dev
-mode: product
+mode: dev
+#mode: product
url: https://paul.walko.org/
enforce_ssl: paul.walko.org/
devurl: http://localhost:4000/
diff --git a/_includes/head_base.html b/_includes/head_base.html
index 3409e9e..6e27c72 100755
--- a/_includes/head_base.html
+++ b/_includes/head_base.html
@@ -5,16 +5,6 @@
window.location.protocol = "https";
-