diff --git a/.env.template b/.env.template
index 7ae0ac6..3c38548 100644
--- a/.env.template
+++ b/.env.template
@@ -16,6 +16,10 @@ THEME=""
 # Enter a subreddit, e.g. "AskReddit"
 SUBREDDIT=""
 
+<<<<<<< HEAD
+=======
+
+>>>>>>> b5393694ca852b5b29d6acb7779af1efd2f345db
 # Filters the comments by range of lenght (min and max characters)
 # Min has to be less or equal to max
 # DO NOT INSERT ANY SPACES BETWEEN THE COMMA AND THE VALUES
@@ -23,3 +27,7 @@ COMMENT_LENGTH_RANGE = "min,max"
 
 # Range is 0 -> 1
 OPACITY="0.9"
+<<<<<<< HEAD
+=======
+
+>>>>>>> b5393694ca852b5b29d6acb7779af1efd2f345db