diff --git a/scraper/retriever.py b/scraper/retriever.py
index 60e77a1..faa2154 100755
--- a/scraper/retriever.py
+++ b/scraper/retriever.py
@@ -23,19 +23,12 @@ def get_market_cap(ticker1):
     return market_cap
 
 
-<<<<<<< HEAD
-=======
 def get_earnings(ticker):
-
     aapl = Ticker(ticker)
-
     performance = aapl.earning_history
-
     return performance
 
 
-
->>>>>>> 87c225170b8caaa835e939886712744ade00a165
 def get_analyst_estimates(ticker):
     estimates = si.get_analysts_info(ticker)
     next_5_years_estimates = estimates["Growth Estimates"].iloc[4].dropna()