diff --git a/setup.py b/setup.py
index f7d2787..d2da96c 100644
--- a/setup.py
+++ b/setup.py
@@ -1,10 +1,6 @@
 from setuptools import setup
 
-<<<<<<< HEAD
-__version__ = '2.1.3'
-=======
 __version__ = '3.0.0a1'
->>>>>>> multiclients
 
 with open('README.md', encoding='utf-8') as f:
     long_description = f.read()