diff --git a/.env.template b/.env.template
index 602769c..5ab4ae4 100644
--- a/.env.template
+++ b/.env.template
@@ -6,9 +6,6 @@ REDDIT_PASSWORD=""
 # Valid options are "yes" and "no" for the variable below
 REDDIT_2FA=""
 
-<<<<<<< HEAD
-=======
 THEME=""
 
->>>>>>> 64fa33fd482ef63e8a75cca1a438a37e078aee48
 SUBREDDIT=""