diff --git a/pyleoclim/__init__.py b/pyleoclim/__init__.py
index 5ce9baac..3f4493f3 100644
--- a/pyleoclim/__init__.py
+++ b/pyleoclim/__init__.py
@@ -1111,7 +1111,6 @@ def summaryTs(timeseries = "", x_axis = "", saveFig = False, dir = "",
             y,x = Timeseries.clean_ts(y,x)
 
     # Perform the analysis
-<<<<<<< HEAD
         default = {'tau':None,
                            'freqs': None,
                            'c':1e-3,
diff --git a/setup.py b/setup.py
index 7b105268..1196b2c7 100644
--- a/setup.py
+++ b/setup.py
@@ -3,11 +3,7 @@
 import sys
 import io
 
-<<<<<<< HEAD
-version = '0.4.0'
-=======
 version = '0.5.0'
->>>>>>> dev-fzhu
 
 # Read the readme file contents into variable
 if sys.argv[-1] == 'publish' or sys.argv[-1] == 'publishtest':