resolve conflicts

_includes/metahead.html

@@ -6,9 +6,7 @@
   <link rel="alternate" type="application/rss+xml" href="{{ site.production_url }}/rss.xml" />
   
   <!-- BEGIN rendered SEO Meta -->
-
   <title>{{ page.title }} | {{ site.title }}</title>
-
   <!-- Standard SEO -->
   <meta name="title" content="{{ page.title }}, {{ site.title }}">
   <meta name="dc.date.modified" scheme="ISO8601" content="{{ site.time | date_to_xmlschema }}" />
@@ -26,10 +24,7 @@
   <meta name="geo.position" content="46.204391;6.143158" />
   <meta name="ICBM" content="46.204391, 6.143158" />
   <meta name="keywords" content="{{ page.keywords}}">
-
-
   <!-- Dublin Core basic info -->
-
   <meta name="dcterms.Identifier" content="{{ site.production_url }}" />
   <meta name="dcterms.Format" content="text/html" />
   <meta name="dcterms.Relation" content="{{ site.title }}" />
@@ -44,9 +39,7 @@
   <meta name="dcterms.Date" content="{{ site.time | date: "%Y-%m-%d" }}" />{% if page.description == null %}
   <meta name="dcterms.Description" content="{{ site.tagline | strip_html }}" />{% else %}
   <meta name="dcterms.Description" content="{{ page.description | strip_html }}" />{% endif %}
-
   <!-- Facebook OpenGraph -->
-
   {% if page.category != "highlights" %}<meta property="og:type" content="website" />
   <meta property="og:url" content="{{ site.production_url }}" />{% else %}
   <meta property="og:type" content="article" />
@@ -64,9 +57,7 @@
   <meta property="og:site_name" content="{{ site.title }}" />
   {% for social_id in site.social_ids %}{% assign social = site.social[social_id] %}<meta property="og:see_also" content="{{ social }}" />
   {% endfor %}
-
   <!-- Twitter Card -->
-
   <meta name="twitter:card" content="summary" />
   <meta name="twitter:site" content="@bpist" />
   <meta name="twitter:title" content="{{ page.title }} | {{ site.title }}" />{% if page.description == null %}

index.html

@@ -87,7 +87,11 @@ poster_image: /assets/vid/intro_loop_.jpg
       <a href="{{ base }}{{ page.url }}" title="{{ page.title }}"><div class="highlights" style="background-image: url('{{ base }}{{ page.image }}')">
       </div><h3>{{ page.title }} </h3></a>
       <p class="editable">
+<<<<<<< HEAD
         Highlights are music-things we think you want to discover. Tracks, articles, videos, interviews and reviews, curated but also original content. They are delivered to you daily. Here or via RSS.
+=======
+        Highlights are things we think you want to discover. Tracks, articles, videos, interviews and reviews, curated but also original content. They are delivered to you daily. Here or via RSS.
+>>>>>>> content
       </p>
 {% endfor %}
 
@@ -96,7 +100,7 @@ poster_image: /assets/vid/intro_loop_.jpg
       <div class="articles editable">
         <h1>What the funk?</h1>
         <p>We are The Outernational Music Syndicate, we believe in music. The Music Industry is healthy and blossoming like never before, there is no crisis in this industry, only greed and middlemen.</p>
-        <p>Basspistol is a middlehand slayer but mostly your magic magnifying glass, allowing you to see what happens when the sweet artists get into to the salty ocean of creativity. This is what we work for. Nothing less, nothing more. And if you want to, <a href="/artists/">we</a> will <a href="/radio">share it with you.</a></p>
+        <p>Basspistol is a middleman slayer but mostly your magic magnifying glass, allowing you to see what happens when the sweet artists get into to the salty ocean of creativity. This is what we work for. Nothing less, nothing more. And if you want to, <a href="/artists/">we</a> will <a href="/radio">share it with you.</a></p>
         <p>We operate this website using inclusively open source tools. We care about you: we do not track what you look at, which article drives traffic or which gender prefers what genre.<br /><br />We are <strong>NOT</strong> data driven, instead our passion is our engine and the freedom we posses allows us to navigate time, without having to care about being profitable.</p>
       </div>
       <div class="records">