diff --git a/layouts/archive/list.html b/layouts/archive/list.html
index 6ccd50f..ae66c69 100644
--- a/layouts/archive/list.html
+++ b/layouts/archive/list.html
@@ -9,6 +9,7 @@
     {{ .Content }}
   </div>
 </header>
+<<<<<<< HEAD
 <main class="main archive">
   <div class="archive__container">
     {{ $filteredPages := .Site.RegularPages }}
@@ -19,6 +20,20 @@
   {{ if gt (len $filteredPages) 0 }}
     {{ $paginator := .Paginate ($filteredPages.GroupByDate ($.Param "archiveGroupByDate" | default "2006")) ($.Param "archivePaginate") }}
     {{ range ($paginator).PageGroups }}
+=======
+{{ if .Pages }}
+  <main class="main archive">
+    <div class="archive__container">
+      {{ $filteredPages := .Site.RegularPages }}
+      {{ range $.Param "notAllowedTypesInArchive" }}
+        {{ $filteredPages = (where $filteredPages "Type" "!=" (lower .)) }}
+      {{ end }}
+  
+      {{ $paginator := .Paginate ($filteredPages.GroupByDate ($.Param "archiveGroupByDate" | default "2006")) ($.Param "archivePaginate") }}
+  
+    {{ if $paginator }}
+      {{ range ($paginator).PageGroups }}
+>>>>>>> 7fcf1bc41734ab53012ec651fbd8ba9b28fd542a
       <span class="archive__key" data-ani="{{ $.Site.Params.enableUiAnimation | default "true" }}">{{ .Key }}</span>
       <ul class="archive__ul" data-dir="{{ $.Param "languagedir" | default "ltr" }}">
         {{ range .Pages }}
@@ -36,6 +51,7 @@
         </li>
         {{ end }}
       </ul>
+<<<<<<< HEAD
     {{ end }}
   {{ else }}
     {{ i18n "no-contents" | default "There is nothing to display" }}
@@ -49,4 +65,18 @@
   </div>
   {{ partial "script/archive-script" . }}
 </main>
-{{ end }}
\ No newline at end of file
+{{ end }}
+=======
+      {{ end }}    
+    {{ end }}
+    </div>
+    <div class="grow"></div>
+    {{ partial "pagination/pagination" . }}
+    <div class="hide">
+      {{ partial "search/site-search" . }}
+    </div>
+    {{ partial "script/archive-script" . }}
+  </main>
+{{ end }}
+{{ end }}
+>>>>>>> 7fcf1bc41734ab53012ec651fbd8ba9b28fd542a
diff --git a/layouts/partials/body/infos.html b/layouts/partials/body/infos.html
index 632e50c..1f1c8b1 100644
--- a/layouts/partials/body/infos.html
+++ b/layouts/partials/body/infos.html
@@ -6,7 +6,11 @@
   {{ end }}
   &nbsp;&middot;&nbsp; <span class="single__info" title="{{ i18n "tooltip-reading-time" }}"> {{ ($.Site.Params.readingTimeIcon | safeHTML) | default "☕" }}&nbsp;{{ .ReadingTime }}&nbsp;{{ i18n "reading-time" }} </span>
   {{ with .Params.Author }}
+<<<<<<< HEAD
   &nbsp;&middot;&nbsp; <span class="single__info" title="{{ i18n "single-writtenBy" }}">{{if $params.AuthorEmoji }}{{ $params.AuthorEmoji }}{{ else }}{{ ($.Site.Params.authorIcon | safeHTML) | default "✍️" }}{{ end }}&nbsp;{{ . }}</span>
+=======
+  &nbsp;&middot;&nbsp; <span class="single__info" title="{{ i18n "single-writtenBy" }}">{{if $params.AuthorEmoji }}{{ $params.AuthorEmoji }}{{ else }}✍️{{ end }}&nbsp;{{ partial "head/author.html" . }}</span>
+>>>>>>> 7fcf1bc41734ab53012ec651fbd8ba9b28fd542a
   {{ end }}
   <span class="single__info">
     {{ if (and .Site.Params.enableBusuanzi .Site.Params.busuanziPagePV) }} &middot; {{ ($.Site.Params.pagePvIcon | safeHTML) | default "👀" }}<span id="busuanzi_value_page_pv">...</span> {{ i18n "counter-page-pv" }}{{ end }}
diff --git a/layouts/partials/body/whoami.html b/layouts/partials/body/whoami.html
index 2428dcd..28c8595 100644
--- a/layouts/partials/body/whoami.html
+++ b/layouts/partials/body/whoami.html
@@ -27,7 +27,7 @@
     </div>
     <div class="whoami__title">
       {{ if $.Param "author" }}
-        {{ $.Param "author" }}
+        {{ partial "head/author.html" ($.Param "author") }}
       {{ else }}
         {{ $.Param "myname" }}
       {{ end }}
diff --git a/layouts/partials/head/author.html b/layouts/partials/head/author.html
new file mode 100644
index 0000000..5a71b59
--- /dev/null
+++ b/layouts/partials/head/author.html
@@ -0,0 +1,7 @@
+{{ $author_type := (printf "%T" .) }}
+{{ $author_is_slice := (eq "[]string" $author_type) }}
+    {{ if $author_is_slice }}
+        {{ delimit . ", " }}
+    {{ else }}
+        {{ . }}
+    {{ end }}
diff --git a/layouts/partials/summary/card.html b/layouts/partials/summary/card.html
index ed8187d..146c4c4 100644
--- a/layouts/partials/summary/card.html
+++ b/layouts/partials/summary/card.html
@@ -8,7 +8,11 @@
       {{ end }} 
       <span title="{{ i18n "tooltip-reading-time" }}" dir="{{ if ne ($.Param "languagedir") "rtl" }}ltr{{ else }}rtl{{ end }}"> &middot; {{ ($.Site.Params.readingTimeIcon | safeHTML) | default "☕" }} {{ .ReadingTime }} {{ i18n "reading-time" }}</span>
       {{ with $.Param "author" }}
+<<<<<<< HEAD
       &middot; <span title="{{ i18n "single-writtenBy" }}" dir="{{ if ne ($.Param "languagedir") "rtl" }}ltr{{ else }}rtl{{ end }}">{{ if $.Param "AuthorEmoji" }}{{ $.Param "AuthorEmoji" }}{{ else }}{{ ($.Site.Params.authorIcon | safeHTML) | default "✍️" }}{{ end }}&nbsp;{{ . }}</span>
+=======
+      &middot; <span title="{{ i18n "single-writtenBy" }}" dir="{{ if ne ($.Param "languagedir") "rtl" }}ltr{{ else }}rtl{{ end }}">{{ if $.Param "AuthorEmoji" }}{{ $.Param "AuthorEmoji" }}{{ else }}✍️{{ end }}&nbsp;{{ partial "head/author.html" . }}</span>
+>>>>>>> 7fcf1bc41734ab53012ec651fbd8ba9b28fd542a
       {{ end }}
     </h6>
   </header>
diff --git a/layouts/partials/summary/classic.html b/layouts/partials/summary/classic.html
index db71419..6958a96 100644
--- a/layouts/partials/summary/classic.html
+++ b/layouts/partials/summary/classic.html
@@ -25,7 +25,11 @@
           {{ end }}
           <span title="{{ i18n "tooltip-reading-time" }}" dir="{{ if ne ($.Param "languagedir") "rtl" }}ltr{{ else }}rtl{{ end }}"> &middot; {{ ($.Site.Params.readingTimeIcon | safeHTML) | default "☕" }}&nbsp;{{ .ReadingTime }}&nbsp;{{ i18n "reading-time" }} </span>
           {{ with $.Param "author" }}
+<<<<<<< HEAD
           &middot; <span title="{{ i18n "single-writtenBy" }}" dir="{{ if ne ($.Param "languagedir") "rtl" }}ltr{{ else }}rtl{{ end }}">{{ if $.Param "authorEmoji" }}{{ $.Param "authorEmoji" }}{{ else }}{{ ($.Site.Params.authorIcon | safeHTML) | default "✍️" }}{{ end }}&nbsp;{{ . }}</span>
+=======
+          &middot; <span title="{{ i18n "single-writtenBy" }}" dir="{{ if ne ($.Param "languagedir") "rtl" }}ltr{{ else }}rtl{{ end }}">{{ if $.Param "authorEmoji" }}{{ $.Param "authorEmoji" }}{{ else }}✍️{{ end }}&nbsp;{{ partial "head/author.html" . }}</span>
+>>>>>>> 7fcf1bc41734ab53012ec651fbd8ba9b28fd542a
           {{ end }}
         </h6>
       </header>
diff --git a/layouts/partials/summary/compact.html b/layouts/partials/summary/compact.html
index a9df179..f0195d3 100644
--- a/layouts/partials/summary/compact.html
+++ b/layouts/partials/summary/compact.html
@@ -11,7 +11,11 @@
           {{ end }} 
           <span title="{{ i18n "tooltip-reading-time" }}" dir="{{ if ne ($.Param "languagedir") "rtl" }}ltr{{ else }}rtl{{ end }}"> &middot; {{ ($.Site.Params.readingTimeIcon | safeHTML) | default "☕" }} {{ .ReadingTime }} {{ i18n "reading-time" }}</span>
           {{ with $params.Author }}
+<<<<<<< HEAD
           &middot; <span title="{{ i18n "single-writtenBy" }}" dir="{{ if ne ($.Param "languagedir") "rtl" }}ltr{{ else }}rtl{{ end }}">{{ if $params.AuthorEmoji }}{{ $params.AuthorEmoji }}{{ else }}{{ ($.Site.Params.authorIcon | safeHTML) | default "✍️" }}{{ end }}&nbsp;{{ . }}</span>
+=======
+          &middot; <span title="{{ i18n "single-writtenBy" }}" dir="{{ if ne ($.Param "languagedir") "rtl" }}ltr{{ else }}rtl{{ end }}">{{ if $params.AuthorEmoji }}{{ $params.AuthorEmoji }}{{ else }}✍️{{ end }}&nbsp;{{ partial "head/author.html" . }}</span>
+>>>>>>> 7fcf1bc41734ab53012ec651fbd8ba9b28fd542a
           {{ end }}
         </h6>
       </header>