diff --git a/.env.template b/.env.template
index 4e3a2d3..526cf65 100644
--- a/.env.template
+++ b/.env.template
@@ -13,9 +13,6 @@ SUBREDDIT=""
 
 # Range is 0 -> 1
 OPACITY="0.9"
-<<<<<<< HEAD
 
 # Valid options are "male" and "female" for the variable below
 VoiceGender=""
-=======
->>>>>>> 65afc5ccc1f1978d6ea7e4a5df8534badd3339b5