diff --git a/pkgdown/_pkgdown.yml b/pkgdown/_pkgdown.yml
index 22af3931..92c09c6a 100644
--- a/pkgdown/_pkgdown.yml
+++ b/pkgdown/_pkgdown.yml
@@ -17,11 +17,7 @@ toc:
 navbar:
   structure:
     left:  [reference, news, book]
-<<<<<<< Updated upstream
-    right: [github, mattermost, stackoverflow, rss, lightswitch]
-=======
-    right: [search, github, mattermost, stackoverflow, rss]
->>>>>>> Stashed changes
+    right: [search, github, mattermost, stackoverflow, rss, lightswitch]
   components:
     home: ~
     reference: