diff --git a/setup.py b/setup.py
index c389a59..68b4276 100644
--- a/setup.py
+++ b/setup.py
@@ -7,7 +7,11 @@ with open(path.join(this_directory, 'README.md'), encoding='utf-8') as f:
     long_description = f.read()
     
 setup(name='mkv-this',
+<<<<<<< HEAD
       version='0.1.33',
+=======
+      version='0.1.34',
+>>>>>>> testing
       description='cli wrapper for markovify: take a text file or URL, markovify, save the results.',
       long_description=long_description,
       long_description_content_type='text/markdown',