diff --git a/programming/language/python/python3-setuptools/pspec.xml b/programming/language/python/python3-setuptools/pspec.xml
index 6aaa8693a9..a1d0e28572 100644
--- a/programming/language/python/python3-setuptools/pspec.xml
+++ b/programming/language/python/python3-setuptools/pspec.xml
@@ -1,3 +1,4 @@
+
 <?xml version="1.0" ?>
 <!DOCTYPE PISI SYSTEM 'http://www.pisilinux.org/projeler/pisi/pisi-spec.dtd'>
 <PISI>
@@ -12,7 +13,7 @@
         <IsA>library</IsA>
         <Summary>Python setuptools</Summary>
         <Description>python-setuptools is a collection of enhancements to the Python distutils that allow you to more easily build and distribute Python packages, especially ones that have dependencies on other packages.</Description>
-        <Archive sha1sum="3de29240fc6c4513120014e93e57a1701a2fae7a" type="targz">https://github.com/pypa/setuptools/archive/v20.10.1.tar.gz</Archive>
+        <Archive sha1sum="ce72e7effddd31cd657dbbdc9308fee236e4fa37" type="targz">https://pypi.python.org/packages/source/s/setuptools/setuptools-19.6.1.tar.gz</Archive>
         <BuildDependencies>
             <Dependency>python3-devel</Dependency>
         </BuildDependencies>
@@ -28,6 +29,7 @@
     </Package>
 
     <History>
+<<<<<<< HEAD
         <Update release="3">
             <Date>2016-05-16</Date>
             <Version>20.10.1</Version>
@@ -42,8 +44,10 @@
             <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-01-29</Date>
+            <Date>2016-04-28</Date>
             <Version>19.6.1</Version>
             <Comment>First release</Comment>
             <Name>Marcin Bojara</Name>