diff --git a/programming/language/python/python3-setuptools/pspec.xml b/programming/language/python/python3-setuptools/pspec.xml
index a1d0e28572..2b92df3218 100644
--- a/programming/language/python/python3-setuptools/pspec.xml
+++ b/programming/language/python/python3-setuptools/pspec.xml
@@ -1,4 +1,3 @@
-
 <?xml version="1.0" ?>
 <!DOCTYPE PISI SYSTEM 'http://www.pisilinux.org/projeler/pisi/pisi-spec.dtd'>
 <PISI>
@@ -29,7 +28,6 @@
     </Package>
 
     <History>
-<<<<<<< HEAD
         <Update release="3">
             <Date>2016-05-16</Date>
             <Version>20.10.1</Version>
@@ -44,8 +42,6 @@
             <Name>Yusuf Aydemir</Name>
             <Email>yusuf.aydemir@pisilinux.org</Email>
         </Update>
-=======
->>>>>>> parent of cc91b33... python3-setuptools version bump to 20.10.1
         <Update release="1">
             <Date>2016-04-28</Date>
             <Version>19.6.1</Version>