diff --git a/CEDA/Market/market.py b/CEDA/Market/market.py
index 9370def..0721206 100644
--- a/CEDA/Market/market.py
+++ b/CEDA/Market/market.py
@@ -47,9 +47,18 @@ def market_data(
 
 if __name__ == "__main__":
     data = market_data(instrument="eurusd",
+<<<<<<< HEAD
                        startdate="2020-01-01",
                        enddate="2021-01-01",
                        timeframe="d1",
                        pricetype="bid",
                        volume=True,
                        flat=True)
+=======
+                        startdate="2020-01-01",
+                        enddate="2021-01-01",
+                        timeframe="d1",
+                        pricetype="bid",
+                        volume=True,
+                        flat=True)
+>>>>>>> master
diff --git a/setup.py b/setup.py
index 7761e6d..040cc32 100644
--- a/setup.py
+++ b/setup.py
@@ -2,7 +2,11 @@ from setuptools import setup, find_packages
 import os
 setup(
     name = "CEDApy",
+<<<<<<< HEAD
     version = "1.0.3",
+=======
+    version = "1.0.3",
+>>>>>>> master
     keywords = "quantitative economic data",
     long_description = open(
     os.path.join(