diff --git a/mkdocs.yml b/mkdocs.yml
index bfb8b98..58fb1a8 100755
--- a/mkdocs.yml
+++ b/mkdocs.yml
@@ -34,10 +34,7 @@ nav:
         - Cron: docker/nextcloud/cron.md
         - Проблемы с data: docker/nextcloud/problems-after-moving-data-folder.md
         - OCC: docker/nextcloud/occ-files-scan.md
-<<<<<<< HEAD
-=======
       - Photoprism: docker/photoprism.md
->>>>>>> 49f6799 (?)
       - Pictshare: docker/pictshare.md
       - Plex: 
         - docker/plex/index.md