diff --git a/backupbot.env b/backupbot.env
index 1daa88d..85f5ae4 100644
--- a/backupbot.env
+++ b/backupbot.env
@@ -1,3 +1,10 @@
+<<<<<<< HEAD
+=======
+# Used by backup_scheduler.sh and web frontend
+# Do not store sensitive credentials in world-readable locations unless necessary
+
+# Timezone for scheduling backups (affects 3 AM backup)
+>>>>>>> 047a0e0 (im at a loss)
 TZ=America/Los_Angeles
 BACKUP_DIR=/backups/postgres
 LOG_FILE=/config/log/pgbackup.log