diff --git a/.env.template b/.env.template
index 3c38548..7ae0ac6 100644
--- a/.env.template
+++ b/.env.template
@@ -16,10 +16,6 @@ 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
@@ -27,7 +23,3 @@ COMMENT_LENGTH_RANGE = "min,max"
 
 # Range is 0 -> 1
 OPACITY="0.9"
-<<<<<<< HEAD
-=======
-
->>>>>>> b5393694ca852b5b29d6acb7779af1efd2f345db
diff --git a/reddit/subreddit.py b/reddit/subreddit.py
index 190dc8a..a84dffc 100644
--- a/reddit/subreddit.py
+++ b/reddit/subreddit.py
@@ -66,21 +66,18 @@ def get_subreddit_threads():
         content["comments"] = []
 
         for top_level_comment in submission.comments:
-<<<<<<< HEAD
             COMMENT_LENGTH_RANGE = [0, Infinity]
             if os.getenv("COMMENT_LENGTH_RANGE"):
                 COMMENT_LENGTH_RANGE = [int(i) for i in os.getenv("COMMENT_LENGTH_RANGE").split(",")]                
             if COMMENT_LENGTH_RANGE[0] <= len(top_level_comment.body) <= COMMENT_LENGTH_RANGE[1]:
-=======
-            if not top_level_comment.stickied:
->>>>>>> upstream/master
-                content["comments"].append(
-                    {
-                        "comment_body": top_level_comment.body,
-                        "comment_url": top_level_comment.permalink,
-                        "comment_id": top_level_comment.id,
-                    }
-                )
+                if not top_level_comment.stickied:
+                    content["comments"].append(
+                        {
+                            "comment_body": top_level_comment.body,
+                            "comment_url": top_level_comment.permalink,
+                            "comment_id": top_level_comment.id,
+                        }
+                    )
 
     except AttributeError as e:
         pass