diff --git a/_includes/article-page-head.html b/_includes/article-page-head.html
index f22b9ce..476737f 100644
--- a/_includes/article-page-head.html
+++ b/_includes/article-page-head.html
@@ -1,5 +1,9 @@
+<<<<<<< HEAD
+=======
+
+>>>>>>> 8269352852ba921163966368847de473d11254aa