diff --git a/_includes/head.html b/_includes/head.html
index 9c75aec..629f5cf 100644
--- a/_includes/head.html
+++ b/_includes/head.html
@@ -1,160 +1,132 @@
-
-
-
-
-
+
+
+
+
+
+ >
- {%- capture seo_tags -%} {% seo title=false %} {%- endcapture -%}
+ {%- capture seo_tags -%}
+ {% seo title=false %}
+ {%- endcapture -%}
- {% if page.image %} {% assign src = page.image.path | default: page.image %}
- {% unless src contains '://' %} {%- capture img_url -%} {% include
- media-url.html src=src subpath=page.media_subpath absolute=true %} {%-
- endcapture -%} {%- capture old_url -%}{{ src | absolute_url }}{%- endcapture
- -%} {%- capture new_url -%}{{ img_url }}{%- endcapture -%} {% assign seo_tags
- = seo_tags | replace: old_url, new_url %} {% endunless %} {% elsif
- site.social_preview_image %} {%- capture img_url -%} {% include media-url.html
- src=site.social_preview_image absolute=true %} {%- endcapture -%} {%- capture
- og_image -%}
-
- {%- endcapture -%} {%- capture twitter_image -%}
-
-
- {%- endcapture -%} {% assign old_meta_clip = '
-
- ' %} {% assign new_meta_clip = og_image | append: twitter_image %} {% assign
- seo_tags = seo_tags | replace: old_meta_clip, new_meta_clip %} {% endif %} {{
- seo_tags }}
+ {% if page.image %}
+ {% assign src = page.image.path | default: page.image %}
+
+ {% unless src contains '://' %}
+ {%- capture img_url -%}
+ {% include media-url.html src=src subpath=page.media_subpath absolute=true %}
+ {%- endcapture -%}
+
+ {%- capture old_url -%}{{ src | absolute_url }}{%- endcapture -%}
+ {%- capture new_url -%}{{ img_url }}{%- endcapture -%}
+
+ {% assign seo_tags = seo_tags | replace: old_url, new_url %}
+ {% endunless %}
+
+ {% elsif site.social_preview_image %}
+ {%- capture img_url -%}
+ {% include media-url.html src=site.social_preview_image absolute=true %}
+ {%- endcapture -%}
+
+ {%- capture og_image -%}
+
+ {%- endcapture -%}
+
+ {%- capture twitter_image -%}
+
+
+ {%- endcapture -%}
+
+ {% assign old_meta_clip = '' %}
+ {% assign new_meta_clip = og_image | append: twitter_image %}
+ {% assign seo_tags = seo_tags | replace: old_meta_clip, new_meta_clip %}
+ {% endif %}
+
+ {{ seo_tags }}
- {%- unless page.layout == 'home' -%} {{ page.title | append: ' | ' }} {%-
- endunless -%} {{ site.title }}
+ {%- unless page.layout == 'home' -%}
+ {{ page.title | append: ' | ' }}
+ {%- endunless -%}
+ {{ site.title }}
{% include_cached favicons.html %}
- {% unless site.assets.self_host.enabled %} {% for hint in
- site.data.origin.cors.resource_hints %} {% for link in hint.links %} {%
- endfor %} {% endfor %} {% endunless %}
+ {% unless site.assets.self_host.enabled %}
+ {% for hint in site.data.origin.cors.resource_hints %}
+ {% for link in hint.links %}
+
+ {% endfor %}
+ {% endfor %}
+ {% endunless %}
- {% unless jekyll.environment == 'production' %} <<<<<<< HEAD
-
- ||||||| d51345e
-
- =======
-
- >>>>>>> upstream_master {% endunless %}
-
-
-
-
-
-
-
-
-
-
-
-
+ {% unless jekyll.environment == 'production' %}
+
+ {% endunless %}
-
+
-
+
+
+
+
+
+
+
+
+
+
+
+
{% if site.toc and page.toc %}
-
- {% endif %} {% if page.layout == 'post' or page.layout == 'page' or
- page.layout == 'home' %}
-
- {% endif %} {% if page.layout == 'page' or page.layout == 'post' %}
-
-
+
+ {% endif %}
+
+ {% if page.layout == 'post' or page.layout == 'page' or page.layout == 'home' %}
+
+ {% endif %}
+
+ {% if page.layout == 'page' or page.layout == 'post' %}
+
+
{% endif %}
- {% include js-selector.html lang=lang %} {% if jekyll.environment ==
- 'production' %}
-
- {% if site.pwa.enabled %}
-
+ {% include js-selector.html lang=lang %}
+
+ {% if jekyll.environment == 'production' %}
+
+ {% if site.pwa.enabled %}
+
+ {% endif %}
+
+
+ {% for analytics in site.analytics %}
+ {% capture str %}{{ analytics }}{% endcapture %}
+ {% assign platform = str | split: '{' | first %}
+ {% if site.analytics[platform].id and site.analytics[platform].id != empty %}
+ {% include analytics/{{ platform }}.html %}
+ {% endif %}
+ {% endfor %}
{% endif %}
-
- {% for analytics in site.analytics %} {% capture str %}{{ analytics }}{%
- endcapture %} {% assign platform = str | split: '{' | first %} {% if
- site.analytics[platform].id and site.analytics[platform].id != empty %} {%
- include analytics/{{ platform }}.html %} {% endif %} {% endfor %} {% endif %}
-
-
- {% for analytics in site.analytics %} {% capture str %}{{ analytics }}{%
- endcapture %} {% assign platform = str | split: '{' | first %} {% if
- site.analytics[platform].id and site.analytics[platform].id != empty %} {%
- include analytics/{{ platform }}.html %} {% endif %} {% endfor %} {% endif %}
{% include metadata-hook.html %}
-
+
\ No newline at end of file