diff --git a/desktop/kde/utils/kfoldersync/pspec.xml b/desktop/kde/utils/kfoldersync/pspec.xml
index 562f462ab7..d8a8417403 100644
--- a/desktop/kde/utils/kfoldersync/pspec.xml
+++ b/desktop/kde/utils/kfoldersync/pspec.xml
@@ -22,7 +22,7 @@
             <Dependency>kxmlgui-devel</Dependency>
             <Dependency>qt5-base-devel</Dependency>
         </BuildDependencies>
-        <Archive type="tarxz" sha1sum="ea8b6f718e0ba56ae7b0e0e64a6069cc25a3ffad">http://kde-apps.org/CONTENT/content-files/164092-kfoldersync-3.0.0_rc1.tar.xz</Archive>
+        <Archive type="tarxz" sha1sum="cd907613df8b85ea7ad9042f9eb4c2da9dff1a07">http://kde-apps.org/CONTENT/content-files/164092-kfoldersync-3.0.0.tar.xz</Archive>
     </Source>
     <Package>
         <Name>kfoldersync</Name>
@@ -47,6 +47,13 @@
         </Files>
     </Package>
     <History>
+        <Update release="2">
+            <Date>2015-12-02</Date>
+            <Version>3.0.0</Version>
+            <Comment>Update to stable version</Comment>
+            <Name>Stefan Gronewold (groni)</Name>
+            <Email>groni@pisilinux.org</Email>
+        </Update>
         <Update release="1">
             <Date>2015-11-05</Date>
             <Version>3.0.0</Version>
diff --git a/pisi-index.xml b/pisi-index.xml
index 105eb48d26..5e00c13c0c 100644
--- a/pisi-index.xml
+++ b/pisi-index.xml
@@ -2849,6 +2849,7 @@
             <Description xml:lang="en">KdeWebkit provides KDE integration of the QtWebKit library.</Description>
             <Archive type="tarxz" sha1sum="cb0600fbce2e3a225ac0e4e56d4bc036dad5058f">mirrors://kde/stable/frameworks/5.16/kdewebkit-5.16.0.tar.xz</Archive>
             <BuildDependencies>
+<<<<<<< HEAD
                 <Dependency>qt5-base-devel</Dependency>
                 <Dependency>qt5-webkit-devel</Dependency>
                 <Dependency>qt5-webkit</Dependency>
@@ -2863,6 +2864,20 @@
                 <Dependency versionFrom="5.16.0">kwallet-devel</Dependency>
                 <Dependency versionFrom="5.16.0">kio-devel</Dependency>
                 <Dependency versionFrom="5.16.0">extra-cmake-modules</Dependency>
+=======
+                <Dependency>libbonobo-devel</Dependency>
+                <Dependency>gtk2-devel</Dependency>
+                <Dependency>python-gtk-devel</Dependency>
+                <Dependency>orbit2-devel</Dependency>
+                <Dependency>glib2-devel</Dependency>
+                <Dependency>libxml2-devel</Dependency>
+                <Dependency>intltool</Dependency>
+                <Dependency>gettext-devel</Dependency>
+                <Dependency>perl</Dependency>
+                <Dependency>gobject-introspection-devel</Dependency>
+                <Dependency>gtk-doc</Dependency>
+                <Dependency>gdk-pixbuf-devel</Dependency>
+>>>>>>> 6862592294bee9dbdf4f9c80e35e2a7216791b99
             </BuildDependencies>
             <SourceURI>desktop/kde/framework/kdewebkit/pspec.xml</SourceURI>
         </Source>
@@ -26167,6 +26182,7 @@ Jabber and others</Summary>
                 <Email>alihan@pisilinux.org</Email>
             </Packager>
             <License>GPLv2</License>
+<<<<<<< HEAD
             <IsA>app</IsA>
             <PartOf>desktop.kde.application</PartOf>
             <Summary xml:lang="en">Small system to administer web accounts for the sites and services across the KDE desktop, including: Google, Facebook, Owncloud, IMAP, 
@@ -26174,6 +26190,15 @@ Jabber and others</Summary>
             <Description xml:lang="en">Small system to administer web accounts for the sites and services across the KDE desktop, including: Google, Facebook, Owncloud, IMAP, 
 Jabber and others</Description>
             <Archive type="tarxz" sha1sum="eb6a855639d54ae331e88680cd5a8caae0118368">http://download.kde.org/stable/applications/15.08.3/src/kaccounts-providers-15.08.3.tar.xz</Archive>
+=======
+            <IsA>app:console</IsA>
+            <PartOf>network.filter</PartOf>
+            <Summary xml:lang="en">Kernel routing and traffic control utilities</Summary>
+            <Summary xml:lang="tr">Çekirdek içinde yer alan ağ trafiği yönlendirme ve trafik kontrol araçları.</Summary>
+            <Description xml:lang="en">Iproute2 is a collection of utilites for controlling TCP/IP networking and traffic control in Linux.</Description>
+            <Description xml:lang="tr">Iproute2 TCP/IP ağları ve trafik kontrolü için araçlar içeren bir koolleksiyondur.</Description>
+            <Archive type="tarxz" sha1sum="0475cf982f4148d90f26d3e327e90f7fbd3206e3">https://www.kernel.org/pub/linux/utils/net/iproute2/iproute2-4.3.0.tar.xz</Archive>
+>>>>>>> 6862592294bee9dbdf4f9c80e35e2a7216791b99
             <BuildDependencies>
                 <Dependency>extra-cmake-modules</Dependency>
                 <Dependency>intltool</Dependency>
@@ -26202,12 +26227,49 @@ Jabber and others</Summary>
             </Files>
         </Package>
         <History>
+<<<<<<< HEAD
             <Update release="1">
                 <Date>2015-11-15</Date>
                 <Version>15.08.3</Version>
                 <Comment>First release</Comment>
                 <Name>Alihan Öztürk</Name>
                 <Email>alihan@pisilinux.org</Email>
+=======
+            <Update release="5">
+                <Date>2015-12-02</Date>
+                <Version>4.3.0</Version>
+                <Comment>Version bump.</Comment>
+                <Name>Ertuğrul Erata</Name>
+                <Email>ertugrulerata@gmail.com</Email>
+            </Update>
+            <Update release="4">
+                <Date>2015-07-20</Date>
+                <Version>4.1.1</Version>
+                <Comment>Version bump.</Comment>
+                <Name>Ertuğrul Erata</Name>
+                <Email>ertugrulerata@gmail.com</Email>
+            </Update>
+            <Update release="3">
+                <Date>2015-04-13</Date>
+                <Version>4.0.0</Version>
+                <Comment>Version bump.</Comment>
+                <Name>Ertuğrul Erata</Name>
+                <Email>ertugrulerata@gmail.com</Email>
+            </Update>
+            <Update release="2">
+                <Date>2013-11-23</Date>
+                <Version>3.12.0</Version>
+                <Comment>Version bump</Comment>
+                <Name>Richard de Bruin</Name>
+                <Email>richdb@pisilinux.org</Email>
+            </Update>
+            <Update release="1">
+                <Date>2012-09-01</Date>
+                <Version>3.5.1</Version>
+                <Comment>First release</Comment>
+                <Name>PisiLinux Community</Name>
+                <Email>admins@pisilinux.org</Email>
+>>>>>>> 6862592294bee9dbdf4f9c80e35e2a7216791b99
             </Update>
         </History>
     </SpecFile>
@@ -32774,6 +32836,7 @@ Jabber and others</Summary>
             <Archive type="tarbz2" sha1sum="6461eab4428c0a8b9e41781b8787510484dea800">mirrors://sourceforge/wxwindows/wxWidgets-3.0.2.tar.bz2</Archive>
             <BuildDependencies>
                 <Dependency>zlib-devel</Dependency>
+<<<<<<< HEAD
                 <Dependency>tiff-devel</Dependency>
                 <Dependency>gtk2-devel</Dependency>
                 <Dependency>expat-devel</Dependency>
@@ -32783,6 +32846,11 @@ Jabber and others</Summary>
                 <Dependency>webkit-gtk2-devel</Dependency>
                 <Dependency>libjpeg-turbo-devel</Dependency>
                 <Dependency>gst-plugins-base-devel</Dependency>
+=======
+                <Dependency>libxml2-devel</Dependency>
+                <Dependency>boost-devel</Dependency>
+                <Dependency>gperf</Dependency>
+>>>>>>> 6862592294bee9dbdf4f9c80e35e2a7216791b99
             </BuildDependencies>
             <Patches>
                 <Patch level="1">make-abicheck-non-fatal.patch</Patch>
@@ -43410,6 +43478,102 @@ Jabber and others</Summary>
                 <Path fileType="data">/usr/lib/pkgconfig/avahi-ui-gtk3.pc</Path>
             </Files>
         </Package>
+<<<<<<< HEAD
+=======
+        <History>
+            <Update release="8">
+                <Date>2014-06-14</Date>
+                <Version>0.18</Version>
+                <Comment>Rebuild for gcc</Comment>
+                <Name>PisiLinux Community</Name>
+                <Email>admins@pisilinux.org</Email>
+            </Update>
+            <Update release="7">
+                <Date>2014-04-23</Date>
+                <Version>0.18</Version>
+                <Comment>Version bump.</Comment>
+                <Name>Marcin Bojara</Name>
+                <Email>marcin@pisilinux.org</Email>
+            </Update>
+            <Update release="6">
+                <Date>2014-04-05</Date>
+                <Version>0.16</Version>
+                <Comment>Rebuild.</Comment>
+                <Name>Serdar Soytetir</Name>
+                <Email>kaptan@pisilinux.org</Email>
+            </Update>
+            <Update release="5">
+                <Date>2014-02-20</Date>
+                <Version>0.16</Version>
+                <Comment>Rebuild Unused</Comment>
+                <Name>Varol Maksutoğlu</Name>
+                <Email>waroi@pisilinux.org</Email>
+            </Update>
+            <Update release="4">
+                <Date>2013-09-05</Date>
+                <Version>0.16</Version>
+                <Comment>Release bump.</Comment>
+                <Name>PisiLinux Community</Name>
+                <Email>admins@pisilinux.org</Email>
+            </Update>
+            <Update release="3">
+                <Date>2013-08-26</Date>
+                <Version>0.15</Version>
+                <Comment>Release bump.</Comment>
+                <Name>Serdar Soytetir</Name>
+                <Email>kaptan@pisilinux.org</Email>
+            </Update>
+            <Update release="2">
+                <Date>2013-03-30</Date>
+                <Version>0.15</Version>
+                <Comment>Version bump.</Comment>
+                <Name>Marcin Bojara</Name>
+                <Email>marcin@pisilinux.org</Email>
+            </Update>
+            <Update release="1">
+                <Date>2012-11-21</Date>
+                <Version>0.12</Version>
+                <Comment>First release</Comment>
+                <Name>PisiLinux Community</Name>
+                <Email>admins@pisilinux.org</Email>
+            </Update>
+        </History>
+    </SpecFile>
+    <SpecFile>
+        <Source>
+            <Name>libbonobo</Name>
+            <Homepage>http://www.gnome.org/</Homepage>
+            <Packager>
+                <Name>PisiLinux Community</Name>
+                <Email>admins@pisilinux.org</Email>
+            </Packager>
+            <License>GPLv2</License>
+            <License>LGPLv2</License>
+            <IsA>library</IsA>
+            <PartOf>desktop.gnome.base</PartOf>
+            <Summary xml:lang="en">GNOME CORBA framework</Summary>
+            <Summary xml:lang="tr">GNOME CORBA geliştirme ortamı</Summary>
+            <Description xml:lang="en">Bonobo is a component system based on CORBA, used by the GNOME desktop.</Description>
+            <Archive type="tarbz2" sha1sum="c7650434a4f328eae6f38a29ee8dadd455f35f9c">mirrors://gnome/libbonobo/2.32/libbonobo-2.32.1.tar.bz2</Archive>
+            <BuildDependencies>
+                <Dependency>orbit2-devel</Dependency>
+                <Dependency>glib2-devel</Dependency>
+                <Dependency>libxml2-devel</Dependency>
+                <Dependency>flex</Dependency>
+                <Dependency>grep</Dependency>
+                <Dependency>popt-devel</Dependency>
+                <Dependency>intltool</Dependency>
+                <Dependency>perl</Dependency>
+                <Dependency>gettext-devel</Dependency>
+                <Dependency>gtk-doc</Dependency>
+            </BuildDependencies>
+            <Patches>
+                <Patch level="0">libbonobo-2.32.1-srcdir-macro.patch</Patch>
+                <Patch level="1">libbonobo-multishlib.patch</Patch>
+            </Patches>
+            <SourceURI>desktop/gnome/base/libbonobo/pspec.xml</SourceURI>
+        </Source>
+>>>>>>> 6862592294bee9dbdf4f9c80e35e2a7216791b99
         <Package>
             <Name>avahi-ui-tools</Name>
             <Summary xml:lang="en">UI tools for mDNS browsing</Summary>
@@ -43895,6 +44059,7 @@ Jabber and others</Summary>
             <Description xml:lang="tr">network-manager-applet, NetworkManager için GTK+ arayüz kitaplığı kullanılarak yazılmış güçlü bir arayüzdür.</Description>
             <Archive type="tarxz" sha1sum="9d486a6fa5a600fab5510a06cad77a6cbd745d8f">http://ftp.gnome.org/mirror/gnome.org/sources/network-manager-applet/1.0/network-manager-applet-1.0.4.tar.xz</Archive>
             <BuildDependencies>
+<<<<<<< HEAD
                 <Dependency>gtk2-devel</Dependency>
                 <Dependency>gtk3-devel</Dependency>
                 <Dependency>libsecret-devel</Dependency>
@@ -43912,6 +44077,12 @@ Jabber and others</Summary>
                 <Dependency>atk-devel</Dependency>
                 <Dependency>eudev-devel</Dependency>
                 <Dependency>intltool</Dependency>
+=======
+                <Dependency>libIDL-devel</Dependency>
+                <Dependency>grep</Dependency>
+                <Dependency>glib2-devel</Dependency>
+                <Dependency>gtk-doc</Dependency>
+>>>>>>> 6862592294bee9dbdf4f9c80e35e2a7216791b99
             </BuildDependencies>
             <SourceURI>network/connection/network-manager-applet/pspec.xml</SourceURI>
         </Source>
@@ -48904,6 +49075,68 @@ Jabber and others</Summary>
                 <Name>PisiLinux Community</Name>
                 <Email>admins@pisilinux.org</Email>
             </Update>
+<<<<<<< HEAD
+=======
+        </History>
+    </SpecFile>
+    <SpecFile>
+        <Source>
+            <Name>kfoldersync</Name>
+            <Homepage>http://ur1.ca/hq3ve</Homepage>
+            <Packager>
+                <Name>Stefan Gronewold (groni)</Name>
+                <Email>groni@pisilinux.org</Email>
+            </Packager>
+            <License>GPLv2</License>
+            <PartOf>system</PartOf>
+            <Summary xml:lang="en">Folder synchronization and backup tool for KDE</Summary>
+            <Description xml:lang="en">Smart folder comparison, It depends only on KDE Frameworks.</Description>
+            <Archive type="tarxz" sha1sum="cd907613df8b85ea7ad9042f9eb4c2da9dff1a07">http://kde-apps.org/CONTENT/content-files/164092-kfoldersync-3.0.0.tar.xz</Archive>
+            <BuildDependencies>
+                <Dependency>extra-cmake-modules</Dependency>
+                <Dependency>gettext-devel</Dependency>
+                <Dependency>cmake</Dependency>
+                <Dependency>kcoreaddons-devel</Dependency>
+                <Dependency>kdbusaddons-devel</Dependency>
+                <Dependency>ki18n-devel</Dependency>
+                <Dependency>kio-devel</Dependency>
+                <Dependency>knotifications-devel</Dependency>
+                <Dependency>kxmlgui-devel</Dependency>
+                <Dependency>qt5-base-devel</Dependency>
+            </BuildDependencies>
+            <SourceURI>desktop/kde/utils/kfoldersync/pspec.xml</SourceURI>
+        </Source>
+        <Package>
+            <Name>kfoldersync</Name>
+            <Summary xml:lang="en">Folder synchronization and backup tool for KDE</Summary>
+            <RuntimeDependencies>
+                <Dependency>kcoreaddons</Dependency>
+                <Dependency>ki18n</Dependency>
+                <Dependency>kio</Dependency>
+                <Dependency>qt5-base</Dependency>
+                <Dependency>libgcc</Dependency>
+                <Dependency>kconfig</Dependency>
+                <Dependency>kxmlgui</Dependency>
+                <Dependency>kitemviews</Dependency>
+                <Dependency>kdbusaddons</Dependency>
+                <Dependency>kconfigwidgets</Dependency>
+                <Dependency>kwidgetsaddons</Dependency>
+            </RuntimeDependencies>
+            <Files>
+                <Path fileType="executable">/usr/bin</Path>
+                <Path fileType="data">/usr/share</Path>
+                <Path fileType="doc">/usr/share/doc</Path>
+            </Files>
+        </Package>
+        <History>
+            <Update release="2">
+                <Date>2015-12-02</Date>
+                <Version>3.0.0</Version>
+                <Comment>Update to stable version</Comment>
+                <Name>Stefan Gronewold (groni)</Name>
+                <Email>groni@pisilinux.org</Email>
+            </Update>
+>>>>>>> 6862592294bee9dbdf4f9c80e35e2a7216791b99
             <Update release="1">
                 <Date>2010-10-13</Date>
                 <Version>1.1</Version>
@@ -82343,7 +82576,16 @@ Jabber and others</Summary>
             <SourceURI>x11/util/font-util/pspec.xml</SourceURI>
         </Source>
         <Package>
+<<<<<<< HEAD
             <Name>font-util</Name>
+=======
+            <Name>xinit</Name>
+            <RuntimeDependencies>
+                <Dependency>libX11</Dependency>
+                <Dependency>xorg-app</Dependency>
+                <Dependency>dbus-x11</Dependency>
+            </RuntimeDependencies>
+>>>>>>> 6862592294bee9dbdf4f9c80e35e2a7216791b99
             <Files>
                 <Path fileType="executable">/usr/bin</Path>
                 <Path fileType="data">/usr/lib/pkgconfig</Path>
@@ -82354,7 +82596,18 @@ Jabber and others</Summary>
             </Files>
         </Package>
         <History>
+<<<<<<< HEAD
             <Update release="5">
+=======
+            <Update release="8">
+                <Date>2015-11-30</Date>
+                <Version>1.3.4</Version>
+                <Comment>add patchs.</Comment>
+                <Name>Ertuğrul Erata</Name>
+                <Email>ertugrulerata@gmail.com</Email>
+            </Update>
+            <Update release="7">
+>>>>>>> 6862592294bee9dbdf4f9c80e35e2a7216791b99
                 <Date>2015-05-10</Date>
                 <Version>1.3.1</Version>
                 <Comment>Version bump.</Comment>
@@ -93251,6 +93504,60 @@ Jabber and others</Summary>
                 <Path fileType="localedata">/usr/share/locale/br</Path>
             </Files>
         </Package>
+<<<<<<< HEAD
+=======
+        <History>
+            <Update release="3">
+                <Date>2014-05-24</Date>
+                <Version>0.4.2</Version>
+                <Comment>Rebuild.</Comment>
+                <Name>Alihan Öztürk</Name>
+                <Email>alihan@pisilinux.org</Email>
+            </Update>
+            <Update release="2">
+                <Date>2014-01-31</Date>
+                <Version>0.4.2</Version>
+                <Comment>Version bump.</Comment>
+                <Name>Stefan Gronewold(groni)</Name>
+                <Email>groni@pisilinux.org</Email>
+            </Update>
+            <Update release="1">
+                <Date>2010-10-12</Date>
+                <Version>0.4.1</Version>
+                <Comment>First release</Comment>
+                <Name>Pisi Linux Admins</Name>
+                <Email>admins@pisilinux.org</Email>
+            </Update>
+        </History>
+    </SpecFile>
+    <SpecFile>
+        <Source>
+            <Name>libcdr</Name>
+            <Homepage>http://www.freedesktop.org/wiki/Software/libcdr</Homepage>
+            <Packager>
+                <Name>PisiLinux Community</Name>
+                <Email>admins@pisilinux.org</Email>
+            </Packager>
+            <License>LGPLv2.1</License>
+            <License>GPLv2</License>
+            <License>MPLv1.1</License>
+            <IsA>library</IsA>
+            <PartOf>multimedia.misc</PartOf>
+            <Summary xml:lang="en">Library parsing the Corel cdr documents</Summary>
+            <Description xml:lang="en">Libcdr is library providing ability to interpret and import Corel Draw drawings into various applications.</Description>
+            <Archive type="tarbz2" sha1sum="fea63690acea2b9eac5dc6f51232154b7bb41a9e">http://dev-www.libreoffice.org/src/libcdr-0.1.0.tar.bz2</Archive>
+            <BuildDependencies>
+                <Dependency>doxygen</Dependency>
+                <Dependency>zlib-devel</Dependency>
+                <Dependency>lcms2-devel</Dependency>
+                <Dependency>icu4c-devel</Dependency>
+                <Dependency>libwpd-devel</Dependency>
+                <Dependency>boost-devel</Dependency>
+                <Dependency>librevenge-devel</Dependency>
+            </BuildDependencies>
+            <SourceURI>multimedia/misc/libcdr/pspec.xml</SourceURI>
+        </Source>
+>>>>>>> 6862592294bee9dbdf4f9c80e35e2a7216791b99
         <Package>
             <Name>gimp-i18n-te</Name>
             <Summary xml:lang="en">Gimp translation files for Telugu</Summary>
@@ -98753,7 +99060,49 @@ uses SIMD instructions (MMX, SSE2, etc.) to accelerate baseline JPEG compression
             <SourceURI>multimedia/misc/libexif/pspec.xml</SourceURI>
         </Source>
         <Package>
+<<<<<<< HEAD
             <Name>libexif</Name>
+=======
+            <Name>inkscape</Name>
+            <RuntimeDependencies>
+                <Dependency>freetype</Dependency>
+                <Dependency>libxml2</Dependency>
+                <Dependency>libpng</Dependency>
+                <Dependency>libgcc</Dependency>
+                <Dependency>libX11</Dependency>
+                <Dependency>glib2</Dependency>
+                <Dependency>zlib</Dependency>
+                <Dependency>dbus-glib</Dependency>
+                <Dependency>popt</Dependency>
+                <Dependency>gtk2</Dependency>
+                <Dependency>pango</Dependency>
+                <Dependency>lcms2</Dependency>
+                <Dependency>cairo</Dependency>
+                <Dependency>poppler-glib</Dependency>
+                <Dependency>gsl</Dependency>
+                <Dependency>aspell</Dependency>
+                <Dependency>libwpg</Dependency>
+                <Dependency>imagemagick</Dependency>
+                <Dependency>glibmm</Dependency>
+                <Dependency>gtkmm</Dependency>
+                <Dependency>fontconfig</Dependency>
+                <Dependency>libsigc++</Dependency>
+                <Dependency>gtkspell</Dependency>
+                <Dependency>cairomm</Dependency>
+                <Dependency>gdk-pixbuf</Dependency>
+                <Dependency>libxslt</Dependency>
+                <Dependency>pangomm</Dependency>
+                <Dependency>libwpd</Dependency>
+                <Dependency>atkmm</Dependency>
+                <Dependency>poppler</Dependency>
+                <Dependency>libcdr</Dependency>
+                <Dependency>libvisio</Dependency>
+                <Dependency>librevenge</Dependency>
+                <Dependency>libjpeg-turbo</Dependency>
+                <Dependency>gc</Dependency>
+                <Dependency>libgomp</Dependency>
+            </RuntimeDependencies>
+>>>>>>> 6862592294bee9dbdf4f9c80e35e2a7216791b99
             <Files>
                 <Path fileType="library">/usr/lib</Path>
                 <Path fileType="doc">/usr/share/doc</Path>
@@ -98774,10 +99123,66 @@ uses SIMD instructions (MMX, SSE2, etc.) to accelerate baseline JPEG compression
             </Files>
         </Package>
         <History>
+<<<<<<< HEAD
             <Update release="3">
                 <Date>2014-05-24</Date>
                 <Version>0.6.21</Version>
                 <Comment>Rebuild</Comment>
+=======
+            <Update release="12">
+                <Date>2015-11-29</Date>
+                <Version>0.91</Version>
+                <Comment>Rebuild for 2.0.</Comment>
+                <Name>Stefan Gronewold (groni)</Name>
+                <Email>groni@pisilinux.org</Email>
+            </Update>
+            <Update release="11">
+                <Date>2015-04-09</Date>
+                <Version>0.91</Version>
+                <Comment>fixed problems.</Comment>
+                <Name>Hakan Yıldız</Name>
+                <Email>hknyldz93@gmail.com</Email>
+            </Update>
+            <Update release="10">
+                <Date>2015-03-07</Date>
+                <Version>0.91</Version>
+                <Comment>rebuild for poppler.</Comment>
+                <Name>Yusuf Aydemir</Name>
+                <Email>yusuf.aydemir@pisilinux.org</Email>
+            </Update>
+            <Update release="9">
+                <Date>2015-02-09</Date>
+                <Version>0.91</Version>
+                <Comment>Version bump.</Comment>
+                <Name>Ertuğrul Erata</Name>
+                <Email>ertugrulerata@gmail.com</Email>
+            </Update>
+            <Update release="8">
+                <Date>2014-10-25</Date>
+                <Version>0.48.5</Version>
+                <Comment>Rebuild.</Comment>
+                <Name>Vedat Demir</Name>
+                <Email>vedat@pisilinux.org</Email>
+            </Update>
+            <Update release="7">
+                <Date>2014-09-14</Date>
+                <Version>0.48.5</Version>
+                <Comment>Version bump.</Comment>
+                <Name>Serdar Soytetir</Name>
+                <Email>kaptan@pisilinux.org</Email>
+            </Update>
+            <Update release="6">
+                <Date>2014-05-30</Date>
+                <Version>0.48.4</Version>
+                <Comment>Rebuild, cleanup.</Comment>
+                <Name>Serdar Soytetir</Name>
+                <Email>kaptan@pisilinux.org</Email>
+            </Update>
+            <Update release="5">
+                <Date>2014-01-28</Date>
+                <Version>0.48.4</Version>
+                <Comment>New patch and some fixes</Comment>
+>>>>>>> 6862592294bee9dbdf4f9c80e35e2a7216791b99
                 <Name>Alihan Öztürk</Name>
                 <Email>alihan@pisilinux.org</Email>
             </Update>
diff --git a/pisi-index.xml.sha1sum b/pisi-index.xml.sha1sum
index 01c04ee32d..5d8fb858eb 100644
--- a/pisi-index.xml.sha1sum
+++ b/pisi-index.xml.sha1sum
@@ -1 +1,5 @@
-0209324318216f148b8b3a728697a7eb00ee483d
\ No newline at end of file
+<<<<<<< HEAD
+0209324318216f148b8b3a728697a7eb00ee483d
+=======
+91daa89ba238400fd62aa78404dc6eddc3d86418
+>>>>>>> 6862592294bee9dbdf4f9c80e35e2a7216791b99
diff --git a/pisi-index.xml.xz.sha1sum b/pisi-index.xml.xz.sha1sum
index a06f35788c..8e9bbc23f7 100644
--- a/pisi-index.xml.xz.sha1sum
+++ b/pisi-index.xml.xz.sha1sum
@@ -1 +1,5 @@
-724be3f5afb71ffe6621b496de36a58a219e56bc
\ No newline at end of file
+<<<<<<< HEAD
+724be3f5afb71ffe6621b496de36a58a219e56bc
+=======
+eb35981d84883cd213853340f5b35c50f7052322
+>>>>>>> 6862592294bee9dbdf4f9c80e35e2a7216791b99