diff --git a/instascrape/scrapers/profile.py b/instascrape/scrapers/profile.py
index 2b5b114..952ba93 100644
--- a/instascrape/scrapers/profile.py
+++ b/instascrape/scrapers/profile.py
@@ -136,10 +136,6 @@ def get_posts(self, webdriver, amount=None, login_first=False, login_pause=60, m
         # Remove excess posts from right of list
         posts = posts[:amount]
 
-<<<<<<< Updated upstream
-=======
-
->>>>>>> Stashed changes
         # If scrape arg is True, scrape all posts using webdriver
         scraped_posts = []
         if scrape: