diff --git a/pisi-index.xml b/pisi-index.xml
index bcb6575860..4882f90ead 100644
--- a/pisi-index.xml
+++ b/pisi-index.xml
@@ -28284,6 +28284,42 @@
                 <Path fileType="data">/usr/lib/libreoffice/share/config/soffice.cfg/*/*/ui/res/rw.zip</Path>
             </Files>
         </Package>
+<<<<<<< HEAD
+        <History>
+            <Update release="1">
+                <Date>2017-12-10</Date>
+                <Version>0.7</Version>
+                <Comment>First release.</Comment>
+                <Name>Ertuğrul Erata</Name>
+                <Email>ertugrulerata@gmail.com</Email>
+            </Update>
+        </History>
+    </SpecFile>
+    <SpecFile>
+        <Source>
+            <Name>upx</Name>
+            <Homepage>http://upx.sourceforge.net/</Homepage>
+            <Packager>
+                <Name>PisiLinux Community</Name>
+                <Email>admins@pisilinux.org</Email>
+            </Packager>
+            <License>GPL</License>
+            <IsA>app:console</IsA>
+            <PartOf>util.archive</PartOf>
+            <Summary xml:lang="en">Ultimate executable compressor.</Summary>
+            <Summary xml:lang="tr">UPX (Ultimate executable compressor), bir dosya sıkıştırıcısı</Summary>
+            <Description xml:lang="en">UPX is an advanced executable file compressor. UPX will typically reduce the file size of programs and DLLs by around 50%-70%, thus reducing disk space, network load times, download times and other distribution and storage costs.</Description>
+            <Description xml:lang="tr">UPX ileri düzey bir çalıştırılabilir dosya sıkıştırıcısıdır. UPX genel olarak programların ve kitaplıkların dosya boyutunu %50 ila %70 oranında sıkıştırarak disk kullanım alanını, ağa yüklenme ve indirme süresini düşürür.</Description>
+            <Archive type="tarbz2" sha1sum="da962c0affb27eae11aa9b6fbd751c3699717b36">http://upx.sourceforge.net/download/upx-3.91-src.tar.bz2</Archive>
+            <Archive type="tarbz2" sha1sum="5ec1c4606fec88c770a9712073e83916f8aed173">http://downloads.sourceforge.net/sevenzip/lzma465.tar.bz2</Archive>
+            <BuildDependencies>
+                <Dependency>ucl-devel</Dependency>
+                <Dependency>zlib-devel</Dependency>
+            </BuildDependencies>
+            <SourceURI>util/archive/upx/pspec.xml</SourceURI>
+        </Source>
+=======
+>>>>>>> af9ec948455dd1beeb26f29f623186dfd41ebd17
         <Package>
             <Name>libreoffice-sa-IN</Name>
             <Summary xml:lang="en">libreoffice-sa-IN, Sanskrit (India) language pack for LibreOffice.</Summary>
@@ -33533,6 +33569,78 @@
                 <Path fileType="executable">/usr/bin</Path>
                 <Path fileType="library">/usr/lib</Path>
                 <Path fileType="man">/usr/share/man</Path>
+<<<<<<< HEAD
+                <Path fileType="localedata">/usr/share/locale</Path>
+                <Path fileType="data">/usr/share/bash-completion/</Path>
+                <Path fileType="data">/usr/share/aclocal</Path>
+                <Path fileType="data">/usr/share/gettext</Path>
+                <Path fileType="data">/usr/share/gir-1.0</Path>
+                <Path fileType="data">/usr/share/installed-tests/appstream-glib</Path>
+            </Files>
+        </Package>
+        <Package>
+            <Name>appstream-glib-devel</Name>
+            <RuntimeDependencies>
+                <Dependency release="1">appstream-glib</Dependency>
+                <Dependency>gcap-devel</Dependency>
+                <Dependency>libxslt-devel</Dependency>
+                <Dependency>glib2-devel</Dependency>
+                <Dependency>libarchive-devel</Dependency>
+                <Dependency>libsoup-devel</Dependency>
+                <Dependency>json-glib-devel</Dependency>
+                <Dependency>gdk-pixbuf-devel</Dependency>
+                <Dependency>libpng-devel</Dependency>
+                <Dependency>gtk3-devel</Dependency>
+                <Dependency>libutil-linux-devel</Dependency>
+            </RuntimeDependencies>
+            <Files>
+                <Path fileType="header">/usr/include</Path>
+                <Path fileType="library">/usr/lib/pkgconfig</Path>
+            </Files>
+        </Package>
+        <History>
+            <Update release="1">
+                <Date>2017-12-10</Date>
+                <Version>0.7.4</Version>
+                <Comment>First release.</Comment>
+                <Name>Ertuğrul Erata</Name>
+                <Email>ertugrulerata@gmail.com</Email>
+            </Update>
+        </History>
+    </SpecFile>
+    <SpecFile>
+        <Source>
+            <Name>glm</Name>
+            <Homepage>http://glm.g-truc.net/</Homepage>
+            <Packager>
+                <Name>PisiLinux Community</Name>
+                <Email>admins@pisilinux.org</Email>
+            </Packager>
+            <License>MIT</License>
+            <IsA>library</IsA>
+            <PartOf>programming.library</PartOf>
+            <Summary xml:lang="en">C++ mathematics library</Summary>
+            <Summary xml:lang="tr">C++ matematik kitaplığı</Summary>
+            <Description xml:lang="en">C++ mathematics library for 3D software based on the OpenGL Shading Language (GLSL) specification</Description>
+            <Description xml:lang="tr">GLM, OpenGL Shading Language (GLSL) spesifikasyonuna dayanan 3D yazılımlar için bir C + + matematik kitaplığıdır.</Description>
+            <Archive type="targz" sha1sum="f75a221f84a8ee53aa5962c8189f4519d07d4182">https://github.com/g-truc/glm/archive/0.9.8.3.tar.gz</Archive>
+            <BuildDependencies>
+                <Dependency>cmake</Dependency>
+            </BuildDependencies>
+            <SourceURI>programming/library/glm/pspec.xml</SourceURI>
+        </Source>
+        <Package>
+            <Name>glm</Name>
+            <Files>
+                <Path fileType="header">/usr/include</Path>
+                <Path fileType="library">/usr/lib</Path>
+            </Files>
+        </Package>
+        <Package>
+            <Name>glm-doc</Name>
+            <Files>
+=======
+>>>>>>> af9ec948455dd1beeb26f29f623186dfd41ebd17
                 <Path fileType="doc">/usr/share/doc</Path>
                 <Path fileType="data">/usr/share/cups</Path>
                 <Path fileType="data">/usr/share/ghostscript</Path>
diff --git a/pisi-index.xml.sha1sum b/pisi-index.xml.sha1sum
index b4c02ddbc8..4ed6b334a1 100644
--- a/pisi-index.xml.sha1sum
+++ b/pisi-index.xml.sha1sum
@@ -1 +1,5 @@
-2f1c5dcaba29cc8a7666dab1d8f123dd88ad6568
\ No newline at end of file
+<<<<<<< HEAD
+2e4ee61eb2c6a1dafe537a86247e0952b7add67e
+=======
+2f1c5dcaba29cc8a7666dab1d8f123dd88ad6568
+>>>>>>> af9ec948455dd1beeb26f29f623186dfd41ebd17
diff --git a/pisi-index.xml.xz b/pisi-index.xml.xz
index f85dad7a02..9656f8aa47 100644
Binary files a/pisi-index.xml.xz and b/pisi-index.xml.xz differ
diff --git a/pisi-index.xml.xz.sha1sum b/pisi-index.xml.xz.sha1sum
index 39fdb3879f..4b441c0097 100644
--- a/pisi-index.xml.xz.sha1sum
+++ b/pisi-index.xml.xz.sha1sum
@@ -1 +1,5 @@
-d6786dfe2e2d2fab60dd23189cb316b4df959647
\ No newline at end of file
+<<<<<<< HEAD
+1db994a311e9e41a6aac864f08177eae7684dafa
+=======
+d6786dfe2e2d2fab60dd23189cb316b4df959647
+>>>>>>> af9ec948455dd1beeb26f29f623186dfd41ebd17
diff --git a/programming/library/appstream-glib/pspec.xml b/programming/library/appstream-glib/pspec.xml
index 6527d8c0bf..81f338d1a5 100644
--- a/programming/library/appstream-glib/pspec.xml
+++ b/programming/library/appstream-glib/pspec.xml
@@ -86,7 +86,7 @@
         <Update release="1">
             <Date>2017-12-10</Date>
             <Version>0.7.4</Version>
-            <Comment>First release.</Comment>
+            <Comment>First release</Comment>
             <Name>Ertuğrul Erata</Name>
             <Email>ertugrulerata@gmail.com</Email>
         </Update>