diff --git a/404.md b/404.md
index 4c25b1e..38d91a7 100755
--- a/404.md
+++ b/404.md
@@ -5,17 +5,13 @@ author: joe_morgan
 excerpt: "Page not found. Your pixels are in another canvas."
 sitemap: false
 permalink: /404.html
----  
+---
 
 Sorry, but the page you were trying to view does not exist --- perhaps you can try searching for it below.
 
 <script type="text/javascript">
   var GOOG_FIXURL_LANG = 'en';
-<<<<<<< HEAD
   var GOOG_FIXURL_SITE = '{{ site.url }}'
-=======
-  var GOOG_FIXURL_SITE = '{{ site.baseurl }}'
->>>>>>> b0f1d61a312d4c7ba53fcc88f6648f890c71c694
 </script>
 <script type="text/javascript"
   src="//linkhelp.clients.google.com/tbproxy/lh/wm/fixurl.js">
diff --git a/_includes/_head.html b/_includes/_head.html
index 807b072..26a6b2d 100755
--- a/_includes/_head.html
+++ b/_includes/_head.html
@@ -12,15 +12,9 @@
 <meta name="google-site-verification" content="{{ site.owner.google.verify }}">{% endif %}
 {% if site.owner.bing-verify %}<meta name="msvalidate.01" content="{{ site.owner.bing-verify }}">{% endif %}
 
-<<<<<<< HEAD
 {% capture canonical %}{{ site.url }}{% if site.permalink contains '.html' %}{{ page.url }}{% else %}{{ page.url | remove:'index.html' | strip_slash }}{% endif %}{% endcapture %}
 <link rel="canonical" href="{{ canonical }}">
 <link href="{{ site.url }}/feed.xml" type="application/atom+xml" rel="alternate" title="{{ site.title }} Feed">
-=======
-{% capture canonical %}{{ site.baseurl }}{% if site.permalink contains '.html' %}{{ page.url }}{% else %}{{ page.url | remove:'index.html' | strip_slash }}{% endif %}{% endcapture %}
-<link rel="canonical" href="{{ canonical }}">
-<link href="{{ site.baseurl }}/feed.xml" type="application/atom+xml" rel="alternate" title="{{ site.title }} Feed">
->>>>>>> b0f1d61a312d4c7ba53fcc88f6648f890c71c694
 
 <!-- http://t.co/dKP3o1e -->
 <meta name="HandheldFriendly" content="True">
@@ -28,37 +22,17 @@
 <meta name="viewport" content="width=device-width, initial-scale=1.0">
 
 <!-- For all browsers -->
-<<<<<<< HEAD
 <link rel="stylesheet" href="{{ site.url }}/assets/css/main.css">
-=======
-<link rel="stylesheet" href="{{ site.baseurl }}/assets/css/main.css">
->>>>>>> b0f1d61a312d4c7ba53fcc88f6648f890c71c694
 
 <meta http-equiv="cleartype" content="on">
 
-<!-- HTML5 Shiv and Media Query Support -->
-<!--[if lt IE 9]>
-<<<<<<< HEAD
-	<script src="{{ site.url }}/assets/js/vendor/html5shiv.min.js"></script>
-	<script src="{{ site.url }}/assets/js/vendor/respond.min.js"></script>
-<![endif]-->
-
 <!-- Modernizr -->
 <script src="{{ site.url }}/assets/js/vendor/modernizr-2.7.1.custom.min.js"></script>
-=======
-	<script src="{{ site.baseurl }}/assets/js/vendor/html5shiv.min.js"></script>
-	<script src="{{ site.baseurl }}/assets/js/vendor/respond.min.js"></script>
-<![endif]-->
-
-<!-- Modernizr -->
-<script src="{{ site.baseurl }}/assets/js/vendor/modernizr-2.7.1.custom.min.js"></script>
->>>>>>> b0f1d61a312d4c7ba53fcc88f6648f890c71c694
 
 <link href='//fonts.googleapis.com/css?family=PT+Sans+Narrow:400,700%7CPT+Serif:400,700,400italic' rel='stylesheet' type='text/css'>
 
 <!-- Icons -->
 <!-- 16x16 -->
-<<<<<<< HEAD
 <link rel="shortcut icon" href="{{ site.url }}/favicon.ico">
 <!-- 32x32 -->
 <link rel="shortcut icon" href="{{ site.url }}/favicon.png">
@@ -70,16 +44,3 @@
 <link rel="apple-touch-icon-precomposed" sizes="114x114" href="{{ site.url }}/images/apple-touch-icon-114x114-precomposed.png">
 <!-- 144x144 (precomposed) for iPad 3rd and 4th generation -->
 <link rel="apple-touch-icon-precomposed" sizes="144x144" href="{{ site.url }}/images/apple-touch-icon-144x144-precomposed.png">
-=======
-<link rel="shortcut icon" href="{{ site.baseurl }}/favicon.ico">
-<!-- 32x32 -->
-<link rel="shortcut icon" href="{{ site.baseurl }}/favicon.png">
-<!-- 57x57 (precomposed) for iPhone 3GS, pre-2011 iPod Touch and older Android devices -->
-<link rel="apple-touch-icon-precomposed" href="{{ site.baseurl }}/images/apple-touch-icon-precomposed.png">
-<!-- 72x72 (precomposed) for 1st generation iPad, iPad 2 and iPad mini -->
-<link rel="apple-touch-icon-precomposed" sizes="72x72" href="{{ site.baseurl }}/images/apple-touch-icon-72x72-precomposed.png">
-<!-- 114x114 (precomposed) for iPhone 4, 4S, 5 and post-2011 iPod Touch -->
-<link rel="apple-touch-icon-precomposed" sizes="114x114" href="{{ site.baseurl }}/images/apple-touch-icon-114x114-precomposed.png">
-<!-- 144x144 (precomposed) for iPad 3rd and 4th generation -->
-<link rel="apple-touch-icon-precomposed" sizes="144x144" href="{{ site.baseurl }}/images/apple-touch-icon-144x144-precomposed.png">
->>>>>>> b0f1d61a312d4c7ba53fcc88f6648f890c71c694
diff --git a/_includes/_navigation.html b/_includes/_navigation.html
index 93e76c3..464433d 100755
--- a/_includes/_navigation.html
+++ b/_includes/_navigation.html
@@ -1,10 +1,6 @@
 <div class="navigation-wrapper">
 	<div class="site-name">
-<<<<<<< HEAD
 		<a href="{{ site.url }}/">{{ site.title }}</a>
-=======
-		<a href="{{ site.baseurl }}/">{{ site.title }}</a>
->>>>>>> b0f1d61a312d4c7ba53fcc88f6648f890c71c694
 	</div><!-- /.site-name -->
 	<div class="top-navigation">
 		<nav role="navigation" id="site-nav" class="nav">
diff --git a/_includes/_open-graph.html b/_includes/_open-graph.html
index 1c25a54..2e1db2c 100755
--- a/_includes/_open-graph.html
+++ b/_includes/_open-graph.html
@@ -5,36 +5,20 @@
 {% if author.twitter %}<meta name="twitter:creator" content="@{{ author.twitter }}">{% endif %}
 {% if page.image.feature %}
 <meta name="twitter:card" content="summary_large_image">
-<<<<<<< HEAD
 <meta name="twitter:image" content="{{ site.url }}/images/{{ page.image.feature }}">
 {% else %}
 <meta name="twitter:card" content="summary">
 <meta name="twitter:image" content="{% if page.image.thumb %}{{ site.url }}/images/{{ page.image.thumb }}{% else %}{{ site.url }}/images/default-thumb.png{% endif %}">
-=======
-<meta name="twitter:image" content="{{ site.baseurl }}/images/{{ page.image.feature }}">
-{% else %}
-<meta name="twitter:card" content="summary">
-<meta name="twitter:image" content="{% if page.image.thumb %}{{ site.baseurl }}/images/{{ page.image.thumb }}{% else %}{{ site.baseurl }}/images/default-thumb.png{% endif %}">
->>>>>>> b0f1d61a312d4c7ba53fcc88f6648f890c71c694
 {% endif %}
 <!-- Open Graph -->
 <meta property="og:locale" content="{{ site.locale }}">
 <meta property="og:type" content="article">
 <meta property="og:title" content="{% if page.title %}{{ page.title }}{% else %}{{ site.title }}{% endif %}">
 {% if page.excerpt %}<meta property="og:description" content="{{ page.excerpt | strip_html }}">{% endif %}
-<<<<<<< HEAD
 <meta property="og:url" content="{{ page.url | replace:'index.html','' | prepend: site.url }}">
 <meta property="og:site_name" content="{{ site.title }}">
 {% if page.image.feature %}
 <meta property="og:image" content="{{ site.url }}/images/{{ page.image.feature }}">
 {% else %}
 <meta property="og:image" content="{% if page.image.thumb %}{{ site.url }}/images/{{ page.image.thumb }}{% else %}{{ site.url }}/images/default-thumb.png{% endif %}">
-=======
-<meta property="og:url" content="{{ page.url | replace:'index.html','' | prepend: site.baseurl }}">
-<meta property="og:site_name" content="{{ site.title }}">
-{% if page.image.feature %}
-<meta property="og:image" content="{{ site.baseurl }}/images/{{ page.image.feature }}">
-{% else %}
-<meta property="og:image" content="{% if page.image.thumb %}{{ site.baseurl }}/images/{{ page.image.thumb }}{% else %}{{ site.baseurl }}/images/default-thumb.png{% endif %}">
->>>>>>> b0f1d61a312d4c7ba53fcc88f6648f890c71c694
 {% endif %}
\ No newline at end of file
diff --git a/_includes/_scripts.html b/_includes/_scripts.html
index 617c5db..9fc26ff 100755
--- a/_includes/_scripts.html
+++ b/_includes/_scripts.html
@@ -1,11 +1,6 @@
 <script src="//ajax.googleapis.com/ajax/libs/jquery/1.9.1/jquery.min.js"></script>
-<<<<<<< HEAD
 <script>window.jQuery || document.write('<script src="{{ site.url }}/assets/js/vendor/jquery-1.9.1.min.js"><\/script>')</script>
 <script src="{{ site.url }}/assets/js/scripts.min.js"></script>
-=======
-<script>window.jQuery || document.write('<script src="{{ site.baseurl }}/assets/js/vendor/jquery-1.9.1.min.js"><\/script>')</script>
-<script src="{{ site.baseurl }}/assets/js/scripts.min.js"></script>
->>>>>>> b0f1d61a312d4c7ba53fcc88f6648f890c71c694
 {% if site.owner.google.analytics %}
 <!-- Asynchronous Google Analytics snippet -->
 <script>
diff --git a/_includes/_social-share.html b/_includes/_social-share.html
index 8d9fc91..3c68277 100755
--- a/_includes/_social-share.html
+++ b/_includes/_social-share.html
@@ -2,7 +2,6 @@
   <h4>Share on</h4>
   <ul>
     <li>
-<<<<<<< HEAD
       <a href="https://twitter.com/intent/tweet?text={{ site.url }}{{ page.url }}" class="twitter" title="Share on Twitter"><i class="fa fa-twitter"></i><span> Twitter</span></a>
     </li>
     <li>
@@ -10,15 +9,6 @@ <h4>Share on</h4>
     </li>
     <li>
       <a href="https://plus.google.com/share?url={{ site.url }}{{ page.url }}" class="google-plus" title="Share on Google Plus"><i class="fa fa-google-plus"></i><span> Google+</span></a>
-=======
-      <a href="https://twitter.com/intent/tweet?text={{ site.baseurl }}{{ page.url }}" class="twitter" title="Share on Twitter"><i class="fa fa-twitter"></i><span> Twitter</span></a>
-    </li>
-    <li>
-      <a href="https://www.facebook.com/sharer/sharer.php?u={{ site.baseurl }}{{ page.url }}" class="facebook" title="Share on Facebook"><i class="fa fa-facebook"></i><span> Facebook</span></a>
-    </li>
-    <li>
-      <a href="https://plus.google.com/share?url={{ site.baseurl }}{{ page.url }}" class="google-plus" title="Share on Google Plus"><i class="fa fa-google-plus"></i><span> Google+</span></a>
->>>>>>> b0f1d61a312d4c7ba53fcc88f6648f890c71c694
     </li>
   </ul>
 </div><!-- /.social-share -->
\ No newline at end of file
diff --git a/_layouts/home.html b/_layouts/home.html
index c924010..8de39bb 100755
--- a/_layouts/home.html
+++ b/_layouts/home.html
@@ -19,11 +19,7 @@
     {% if page.image.feature contains 'http' %}
       "{{ page.image.feature }}"
     {% else %}
-<<<<<<< HEAD
       "{{ site.url }}/images/{{ page.image.feature }}"
-=======
-      "{{ site.baseurl }}/images/{{ page.image.feature }}"
->>>>>>> b0f1d61a312d4c7ba53fcc88f6648f890c71c694
     {% endif %}
   alt="{{ page.title }} feature image">
   {% if page.image.credit %}
@@ -37,7 +33,6 @@
     {% include _author-bio.html %}
   </div>
   <div id="index">
-<<<<<<< HEAD
     <h3><a href="{{ site.url}}/posts/">Recent Posts</a></h3>
     {% for post in site.posts limit:5 %}
     <article>
@@ -46,16 +41,6 @@ <h2 class="link-post"><a href="{{ site.url }}{{ post.url }}" title="{{ post.titl
           <a href="{{ post.link }}" target="_blank" title="{{ post.title }}"><i class="fa fa-link"></i></a></h2>
       {% else %}
         <h2><a href="{{ site.url }}{{ post.url }}" title="{{ post.title }}">{{ post.title }}</a></h2>
-=======
-    <h3><a href="{{ site.baseurl}}/posts/">Recent Posts</a></h3>
-    {% for post in site.posts limit:5 %}
-    <article>
-      {% if post.link %}
-        <h2 class="link-post"><a href="{{ site.baseurl }}{{ post.url }}" title="{{ post.title }}">{{ post.title }}</a>
-          <a href="{{ post.link }}" target="_blank" title="{{ post.title }}"><i class="fa fa-link"></i></a></h2>
-      {% else %}
-        <h2><a href="{{ site.baseurl }}{{ post.url }}" title="{{ post.title }}">{{ post.title }}</a></h2>
->>>>>>> b0f1d61a312d4c7ba53fcc88f6648f890c71c694
         <p>{{ post.excerpt | strip_html | truncate: 160 }}</p>
       {% endif %}
     </article>
diff --git a/_layouts/page.html b/_layouts/page.html
index 9e8d0c5..8477f39 100755
--- a/_layouts/page.html
+++ b/_layouts/page.html
@@ -19,11 +19,7 @@
     {% if page.image.feature contains 'http' %}
       "{{ page.image.feature }}"
     {% else %}
-<<<<<<< HEAD
       "{{ site.url }}/images/{{ page.image.feature }}"
-=======
-      "{{ site.baseurl }}/images/{{ page.image.feature }}"
->>>>>>> b0f1d61a312d4c7ba53fcc88f6648f890c71c694
     {% endif %}
   alt="{{ page.title }} feature image">
   {% if page.image.credit %}
@@ -57,7 +53,7 @@ <h1>{{ page.title }}</h1>
   </footer>
 </div><!-- /.footer-wrap -->
 
-{% include _scripts.html %}          
+{% include _scripts.html %}
 
 </body>
 </html>
\ No newline at end of file
diff --git a/_layouts/post-index.html b/_layouts/post-index.html
index a0a2437..814f7e9 100755
--- a/_layouts/post-index.html
+++ b/_layouts/post-index.html
@@ -19,11 +19,7 @@
     {% if page.image.feature contains 'http' %}
       "{{ page.image.feature }}"
     {% else %}
-<<<<<<< HEAD
       "{{ site.url }}/images/{{ page.image.feature }}"
-=======
-      "{{ site.baseurl }}/images/{{ page.image.feature }}"
->>>>>>> b0f1d61a312d4c7ba53fcc88f6648f890c71c694
     {% endif %}
   alt="{{ page.title }} feature image">
   {% if page.image.credit %}
@@ -50,15 +46,9 @@ <h3>{{ post.date | date: '%Y' }}</h3>
       {% endunless %}
       <article>
         {% if post.link %}
-<<<<<<< HEAD
           <h2 class="link-post"><a href="{{ site.url }}{{ post.url }}" title="{{ post.title }}">{{ post.title }}</a> <a href="{{ post.link }}" target="_blank" title="{{ post.title }}"><i class="fa fa-link"></i></a></h2>
         {% else %}
           <h2><a href="{{ site.url }}{{ post.url }}" title="{{ post.title }}">{{ post.title }}</a></h2>
-=======
-          <h2 class="link-post"><a href="{{ site.baseurl }}{{ post.url }}" title="{{ post.title }}">{{ post.title }}</a> <a href="{{ post.link }}" target="_blank" title="{{ post.title }}"><i class="fa fa-link"></i></a></h2>
-        {% else %}
-          <h2><a href="{{ site.baseurl }}{{ post.url }}" title="{{ post.title }}">{{ post.title }}</a></h2>
->>>>>>> b0f1d61a312d4c7ba53fcc88f6648f890c71c694
           <p>{{ post.excerpt | strip_html | truncate: 160 }}</p>
         {% endif %}
       </article>
diff --git a/_layouts/post.html b/_layouts/post.html
index bf2acd1..8bd0e63 100755
--- a/_layouts/post.html
+++ b/_layouts/post.html
@@ -19,11 +19,7 @@
     {% if page.image.feature contains 'http' %}
       "{{ page.image.feature }}"
     {% else %}
-<<<<<<< HEAD
       "{{ site.url }}/images/{{ page.image.feature }}"
-=======
-      "{{ site.baseurl }}/images/{{ page.image.feature }}"
->>>>>>> b0f1d61a312d4c7ba53fcc88f6648f890c71c694
     {% endif %}
   alt="{{ page.title }} feature image">
   {% if page.image.credit %}
@@ -41,11 +37,7 @@
       {% if page.link %}
         <h1><a href="{{ page.link }}">{{ page.title }}</a></h1>
       {% else %}
-<<<<<<< HEAD
         <h1><a href="{{ site.url }}{{ page.url }}" rel="bookmark" title="{{ page.title }}">{{ page.title }}</a></h1>
-=======
-        <h1><a href="{{ site.baseurl }}{{ page.url }}" rel="bookmark" title="{{ page.title }}">{{ page.title }}</a></h1>
->>>>>>> b0f1d61a312d4c7ba53fcc88f6648f890c71c694
       {% endif %}
     </div><!--/ .headline-wrap -->
     <div class="article-wrap">
@@ -65,17 +57,10 @@ <h1><a href="{{ site.baseurl }}{{ page.url }}" rel="bookmark" title="{{ page.tit
 <div class="footer-wrap">
   {% if site.related_posts.size > 0 %}
   <div class="related-articles">
-<<<<<<< HEAD
   <h4>You might also enjoy <small class="pull-right">(<a href="{{ site.url }}/posts/">View all posts</a>)</small></h4>
     <ul>
     {% for post in site.related_posts limit:3 %}
       <li><a href="{{ site.url }}{{ post.url }}" title="{{ post.title }}">{{ post.title }}</a></li>
-=======
-  <h4>You might also enjoy <small class="pull-right">(<a href="{{ site.baseurl }}/posts/">View all posts</a>)</small></h4>
-    <ul>
-    {% for post in site.related_posts limit:3 %}
-      <li><a href="{{ site.baseurl }}{{ post.url }}" title="{{ post.title }}">{{ post.title }}</a></li>
->>>>>>> b0f1d61a312d4c7ba53fcc88f6648f890c71c694
     {% endfor %}
     </ul>
     <hr />
@@ -86,7 +71,7 @@ <h4>You might also enjoy <small class="pull-right">(<a href="{{ site.baseurl }}/
   </footer>
 </div><!-- /.footer-wrap -->
 
-{% include _scripts.html %}	        
+{% include _scripts.html %}
 
 </body>
 </html>
\ No newline at end of file
diff --git a/_sass/elements.scss b/_sass/elements.scss
index dd5cdf7..dfa868c 100755
--- a/_sass/elements.scss
+++ b/_sass/elements.scss
@@ -1,18 +1,18 @@
-/* 
+/*
    Rules
    ========================================================================== */
 
-hr { 
-	display: block; 
-	margin: 1em 0; 
+hr {
+	display: block;
+	margin: 1em 0;
 	padding: 0;
-	height: 1px; 
-	border: 0; 
+	height: 1px;
+	border: 0;
 	border-top: 1px solid #ccc;
-	border-bottom: 1px solid #fff; 
+	border-bottom: 1px solid #fff;
 }
 
-/* 
+/*
    Figures and images
    ========================================================================== */
 
@@ -23,13 +23,13 @@ figure {
 article img {
 	max-width: 100%;
 	height: auto;
-	border-width: 0; 
-	vertical-align: middle; 
-	-ms-interpolation-mode: bicubic; 
+	border-width: 0;
+	vertical-align: middle;
+	-ms-interpolation-mode: bicubic;
 }
 
 svg:not(:root) {
-		overflow: hidden; 
+		overflow: hidden;
 }
 
 /* 2 images of equal dimensions in a row */
@@ -62,7 +62,7 @@ svg:not(:root) {
 	}
 }
 
-/* 
+/*
    Buttons
    ========================================================================== */
 
@@ -82,12 +82,6 @@ svg:not(:root) {
   border-color: $primary;
   text-decoration: none !important;
   @include rounded(3px);
-<<<<<<< HEAD
-  &:visited {
-    color: $white;
-  }
-=======
->>>>>>> b0f1d61a312d4c7ba53fcc88f6648f890c71c694
   &:hover {
     background-color: $white;
     color: $primary;
@@ -100,12 +94,6 @@ svg:not(:root) {
   background-color: $success;
   color: $white;
   border-color: $success;
-<<<<<<< HEAD
-  &:visited {
-    color: $white;
-  }
-=======
->>>>>>> b0f1d61a312d4c7ba53fcc88f6648f890c71c694
   &:hover {
     background-color: $white;
     color: $success;
@@ -118,12 +106,6 @@ svg:not(:root) {
   background-color: $warning;
   color: $white;
   border-color: $warning;
-<<<<<<< HEAD
-  &:visited {
-    color: $white;
-  }
-=======
->>>>>>> b0f1d61a312d4c7ba53fcc88f6648f890c71c694
   &:hover {
     background-color: $white;
     color: $warning;
@@ -136,12 +118,6 @@ svg:not(:root) {
   background-color: $danger;
   color: $white;
   border-color: $danger;
-<<<<<<< HEAD
-  &:visited {
-    color: $white;
-  }
-=======
->>>>>>> b0f1d61a312d4c7ba53fcc88f6648f890c71c694
   &:hover {
     background-color: $white;
     color: $danger;
@@ -154,19 +130,11 @@ svg:not(:root) {
   background-color: $info;
   color: $white;
   border-color: $info;
-<<<<<<< HEAD
-  &:visited {
-    color: $white;
-  }
-=======
->>>>>>> b0f1d61a312d4c7ba53fcc88f6648f890c71c694
-  &:hover {
-    background-color: $white;
-    color: $info;
-  }
+  background-color: $white;
+  color: $info;
 }
 
-/* 
+/*
    Wells
    ========================================================================== */
 
diff --git a/_sass/page.scss b/_sass/page.scss
index affffe6..7d24644 100755
--- a/_sass/page.scss
+++ b/_sass/page.scss
@@ -8,7 +8,7 @@ body {
 	color: $text-color;
 }
 
-/* 
+/*
    Header
    ========================================================================== */
 
@@ -79,7 +79,7 @@ body {
 			white-space: nowrap;
 			border-bottom: 0 solid transparent;
 		}
-		a { 
+		a {
 			display: block;
 			padding: 10px 0;
 			decoration: none;
@@ -165,11 +165,11 @@ $button-size: 1.5rem;
 	}
 }
 // Style the toggle menu link and hide it
-.nav .navtoogle {	
+.nav .navtoogle {
 	@include font-rem(18);
 	font-weight: normal;
 	background-color: $black;
-	color: $white;	
+	color: $white;
 	border: none;
 	cursor: pointer;
 	@media #{$small} {
@@ -206,7 +206,7 @@ $button-size: 1.5rem;
 	}
 }
 // Displaying the menu when the user has clicked on the button
-.js .nav .active + ul {		
+.js .nav .active + ul {
 	max-height: 30em;
 	overflow: hidden;
 	-webkit-transition: max-height .4s;
@@ -356,12 +356,6 @@ $button-size: 1.5rem;
   margin-bottom: 5px;
   @include font-rem(14);
   color: $black;
-<<<<<<< HEAD
-  &:visited {
-    color: $black;
-  }
-=======
->>>>>>> b0f1d61a312d4c7ba53fcc88f6648f890c71c694
   &:hover {
     @include scale(1.1);
   }
@@ -376,15 +370,6 @@ $button-size: 1.5rem;
 /* Author sidebar */
 .article-author-side {
 	display: none;
-<<<<<<< HEAD
-=======
-	p{
-		margin-bottom:0.8em;
-		&:last-of-type{
-			margin-bottom:20px;
-		}
-	}
->>>>>>> b0f1d61a312d4c7ba53fcc88f6648f890c71c694
 	.bio-photo {
 		max-width: 110px;
 		@include rounded(150px);
@@ -404,12 +389,6 @@ $button-size: 1.5rem;
 			margin-top: 10px;
 			margin-bottom: 10px;
 		}
-<<<<<<< HEAD
-		p {
-			margin-bottom: 20px;
-		}
-=======
->>>>>>> b0f1d61a312d4c7ba53fcc88f6648f890c71c694
 		.author-social {
 			margin-bottom: 5px;
 		}
@@ -563,7 +542,7 @@ $button-size: 1.5rem;
 	margin: 1em 0;
 	li {
 		display: inline;
-		a { 
+		a {
 			border-bottom: 0 solid transparent;
 			&:hover {
 				border-bottom: 0 solid transparent;
@@ -589,7 +568,7 @@ $button-size: 1.5rem;
   li {
   	display: inline-block;
   }
-  $social: 
+  $social:
   (facebook, $facebook-color),
   (flickr, $flickr-color),
   (foursquare, $foursquare-color),
@@ -605,7 +584,7 @@ $button-size: 1.5rem;
   @each $socialnetwork, $color in $social {
     .#{$socialnetwork} {
       background: $color;
-    }    
+    }
   }
   a {
 	  display: block;
@@ -644,15 +623,11 @@ $button-size: 1.5rem;
 	padding-bottom: 3em;
 	a,
 	a:active,
-<<<<<<< HEAD
-	a:visited,
-=======
->>>>>>> b0f1d61a312d4c7ba53fcc88f6648f890c71c694
 	p,
 	h4,
 	h5,
 	h6,
-	span { 
+	span {
 		@include font-rem(14);
 	}
 	footer {
@@ -697,7 +672,7 @@ $button-size: 1.5rem;
 	}
 }
 
-/* 
+/*
    Browser upgrade alert
    ========================================================================== */
 
@@ -717,7 +692,7 @@ $button-size: 1.5rem;
 		}
 	}
 }
-/* 
+/*
    Google search form
    ========================================================================== */
 
diff --git a/_sass/typography.scss b/_sass/typography.scss
index 5364aca..db07971 100755
--- a/_sass/typography.scss
+++ b/_sass/typography.scss
@@ -2,11 +2,9 @@
    Typography
    ========================================================================== */
 
-<<<<<<< HEAD
-/* 
+/*
 =======
 /*
->>>>>>> b0f1d61a312d4c7ba53fcc88f6648f890c71c694
    Headings
    ========================================================================== */
 
@@ -32,31 +30,30 @@ h6 {
 	@include font-size(14);
 }
 
-<<<<<<< HEAD
-/* 
+/*
    Links
    ========================================================================== */
 
-a { 
+a {
 	text-decoration: none;
-	color: $link-color; 
-	&:visited { 
-		color: $linkcolorvisited; 
+	color: $link-color;
+	&:visited {
+		color: $linkcolorvisited;
 	}
-	&:hover { 
-		color: $linkcolorhover; 
+	&:hover {
+		color: $linkcolorhover;
 	}
-	&:focus { 
-		outline: thin dotted; 
+	&:focus {
+		outline: thin dotted;
 		color: $linkcolorfocus;
 	}
-	&:hover, 
-	&:active { 
-		outline: 0; 
+	&:hover,
+	&:active {
+		outline: 0;
 	}
 }
 
-/* 
+/*
 =======
 /*
    Links
@@ -83,7 +80,6 @@ span a {
 	}
 }
 /*
->>>>>>> b0f1d61a312d4c7ba53fcc88f6648f890c71c694
    Figure captions
    ========================================================================== */
 
@@ -94,11 +90,9 @@ figcaption {
 	color: lighten($text-color, 10);
 }
 
-<<<<<<< HEAD
-/* 
+/*
 =======
 /*
->>>>>>> b0f1d61a312d4c7ba53fcc88f6648f890c71c694
    Feature image captions
    ========================================================================== */
 
@@ -125,11 +119,9 @@ figcaption {
 	}
 }
 
-<<<<<<< HEAD
-/* 
+/*
 =======
 /*
->>>>>>> b0f1d61a312d4c7ba53fcc88f6648f890c71c694
    Notices
    ========================================================================== */
 
@@ -143,11 +135,9 @@ figcaption {
 	@include rounded(3px);
 }
 
-<<<<<<< HEAD
-/* 
+/*
 =======
 /*
->>>>>>> b0f1d61a312d4c7ba53fcc88f6648f890c71c694
    Blockquotes
    ========================================================================== */
 
@@ -159,11 +149,9 @@ blockquote {
 	font-style: italic;
 }
 
-<<<<<<< HEAD
-/* 
+/*
 =======
 /*
->>>>>>> b0f1d61a312d4c7ba53fcc88f6648f890c71c694
    Footnotes
    ========================================================================== */
 
@@ -174,11 +162,9 @@ blockquote {
 	}
 }
 
-<<<<<<< HEAD
-/* 
+/*
 =======
 /*
->>>>>>> b0f1d61a312d4c7ba53fcc88f6648f890c71c694
    Paragraphs
    ========================================================================== */
 
@@ -193,11 +179,9 @@ p {
 	}
 }
 
-<<<<<<< HEAD
-/* 
+/*
 =======
 /*
->>>>>>> b0f1d61a312d4c7ba53fcc88f6648f890c71c694
    Code snippets
    ========================================================================== */
 
@@ -205,11 +189,7 @@ tt, code, kbd, samp, pre {
 	font-family: $code-font;
 }
 p,
-<<<<<<< HEAD
-li { 
-=======
 li {
->>>>>>> b0f1d61a312d4c7ba53fcc88f6648f890c71c694
 	code {
 		@include font-rem(12);
 		line-height: 1.5;
diff --git a/_sass/variables.scss b/_sass/variables.scss
index c02efe2..a152c2a 100755
--- a/_sass/variables.scss
+++ b/_sass/variables.scss
@@ -2,31 +2,23 @@
    Sass variables
    ========================================================================== */
 
-<<<<<<< HEAD
-/* 
+/*
 =======
 /*
->>>>>>> b0f1d61a312d4c7ba53fcc88f6648f890c71c694
    Typography
    ========================================================================== */
 
 $doc-font-size: 16;
 $doc-line-height: 26;
-<<<<<<< HEAD
-$paragraph-indent: true !default;
-=======
 $paragraph-indent: false !default;
->>>>>>> b0f1d61a312d4c7ba53fcc88f6648f890c71c694
 $base-font: 'PT Serif', serif;
 $heading-font: 'PT Sans Narrow', sans-serif;
 $code-font: Monaco, "Courier New", "DejaVu Sans Mono", "Bitstream Vera Sans Mono", monospace;
 $alt-font: $base-font;
 
-<<<<<<< HEAD
-/* 
+/*
 =======
 /*
->>>>>>> b0f1d61a312d4c7ba53fcc88f6648f890c71c694
    Colors
    ========================================================================== */
 
@@ -35,13 +27,10 @@ $body-color     : $bodycolor;
 $textcolor      : #333332;
 $text-color     : $textcolor;
 $border-color   : $text-color;
-<<<<<<< HEAD
-$basecolor 		  : #343434;	  
-$compcolor 		  : spin($basecolor, 180); 
-=======
 $basecolor 		  : #343434;
 $compcolor 		  : spin($basecolor, 180);
->>>>>>> b0f1d61a312d4c7ba53fcc88f6648f890c71c694
+$basecolor 		  : #343434;
+$compcolor 		  : spin($basecolor, 180);
 $bordercolor    : $basecolor;
 $white          : #fff;
 $black          : #111;
@@ -69,18 +58,16 @@ $vimeo-color        : #1ab7ea;
 $youtube-color      : #ff3333;
 
 /* links */
-<<<<<<< HEAD
 $linkcolor 		    : #343434;
 $link-color       : $linkcolor;
 $linkcolorhover 	: darken($linkcolor, 10);
 $linkcolorvisited : lighten($linkcolorhover, 20);
 $linkcolorfocus 	: darken($linkcolorvisited, 10);
 
-/* 
+/*
    Breakpoints
    ========================================================================== */
-   
-=======
+
 $linkcolor 		    : #444;
 $link-color       : $linkcolor;
 $linkcolorhover 	: #65b6dc;
@@ -91,7 +78,6 @@ $linkcolorfocus 	: darken($linkcolor, 10);
    Breakpoints
    ========================================================================== */
 
->>>>>>> b0f1d61a312d4c7ba53fcc88f6648f890c71c694
 $micro            : "only screen and (min-width: 30em)";
 $small            : "only screen and (min-width: 37.5em)";
 $medium           : "only screen and (min-width: 48em)";