diff --git a/backupbot.env b/backupbot.env
index 85f5ae4..9e7130d 100644
--- a/backupbot.env
+++ b/backupbot.env
@@ -1,13 +1,8 @@
-<<<<<<< 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
 MAX_RETRIES=3
 GOTIFY_URL=http://gotify.example.com
 GOTIFY_TOKEN=your_gotify_token_here
+BACKUP_HOUR=03
+BACKUP_MINUTE=00