diff --git a/setup.py b/setup.py
index f3feb4a..690394c 100755
--- a/setup.py
+++ b/setup.py
@@ -7,7 +7,11 @@
 
 setup(
     name='language_tool_python',
+<<<<<<< Updated upstream
     version='2.8',
+=======
+    version='2.7.4',
+>>>>>>> Stashed changes
     description='Checks grammar using LanguageTool.',
     long_description_content_type='text/markdown',
     long_description=long_description,