diff --git a/.gitignore b/.gitignore
index b6bc453..be074b0 100644
--- a/.gitignore
+++ b/.gitignore
@@ -39,6 +39,9 @@ traefik/letsencrypt/acme.json
 traefik/logs/*
 traefik/certs/*
 
+# Monitoring
+monitoring/prometheus.yml
+
 # Python 
 .python-version
 venv/
@@ -73,9 +76,6 @@ replacements.txt
 # Misc
 .DS_Store
 .idea
-<<<<<<< HEAD
-=======
 
 # Temp files
 edu_master/temp/
->>>>>>> 1abf4a7 (chore: gitignored temp folder for references)