Resolve conflicts

Author: ninjascant

setup.py

@@ -11,7 +11,7 @@ def read(fname):
 
 setup(
     name='ethereum-etl',
-    version='1.10.2',
+    version='1.11.1',
     author='Evgeny Medvedev',
     author_email='evge.medvedev@gmail.com',
     description='Tools for exporting Ethereum blockchain data to CSV or JSON',