diff --git a/.gitignore b/.gitignore
index 21dcd5b..93750b3 100644
--- a/.gitignore
+++ b/.gitignore
@@ -51,8 +51,12 @@ immich/library/
 immich/postgres/
 esphome/config/
 organizr/config/
+<<<<<<< HEAD
 audiobookshelf/audiobooks/
 audiobookshelf/config/
 audiobookshelf/metadata/
 audiobookshelf/podcasts/
 system-monitoring/grafana/storage/
+=======
+homepage/homepage-config/logs/
+>>>>>>> 39bab5a (added homepage logs to gitignore)