diff --git a/programming/library/libaccounts-glib/pspec.xml b/programming/library/libaccounts-glib/pspec.xml
index 3bcc138a3c..98ed850306 100644
--- a/programming/library/libaccounts-glib/pspec.xml
+++ b/programming/library/libaccounts-glib/pspec.xml
@@ -12,7 +12,7 @@
         <License>LGPLv2</License>
         <Summary>Accounts and SSO (Single Sign-On) framework</Summary>
         <Description>Accounts and SSO (Single Sign-On) framework for Linux and POSIX based platforms.</Description>
-        <Archive sha1sum="35fdf91691682a8302ec09d3c52a0985f05d6b9b" type="tarbz2">https://gitlab.com/accounts-sso/libaccounts-glib/repository/archive.tar.bz2</Archive>
+        <Archive sha1sum="1fdb57720284be9c4f7fd45085fd3f81e93d4ab3" type="tarbz2">https://gitlab.com/accounts-sso/libaccounts-glib/repository/archive.tar.bz2</Archive>
         <BuildDependencies>
             <Dependency>glib2-devel</Dependency>
             <Dependency>libxml2-devel</Dependency>
@@ -39,6 +39,8 @@
             <Path fileType="data">/usr/share/libaccounts-glib/testdata</Path>
             <Path fileType="data">/usr/share/dbus-1/interfaces/com.google.code.AccountsSSO.Accounts.Manager.xml</Path>
             <Path fileType="man">/usr/share/man/man1</Path>
+            <Path fileType="data">/usr/share/gir-1.0/Accounts-1.0.gir</Path>
+            <Path fileType="data">/usr/share/vala</Path>
         </Files>
     </Package>
 
@@ -54,8 +56,6 @@
         <Files>
             <Path fileType="header">/usr/include</Path>
             <Path fileType="library">/usr/lib/pkgconfig</Path>
-            <Path fileType="data">/usr/share/gir-1.0/Accounts-1.0.gir</Path>
-            <Path fileType="data">/usr/share/vala</Path>
         </Files>
     </Package>
 
@@ -73,16 +73,6 @@
     </Package>
 
     <History>
-<<<<<<< HEAD
-        <Update release="2">
-            <Date>2016-05-20</Date>
-            <Version>1.18</Version>
-            <Comment>Rebuild for qt5</Comment>
-            <Name>Alihan Öztürk</Name>
-            <Email>alihan@pisilinux.org</Email>
-        </Update>
-=======
->>>>>>> parent of 647daa4... libaccounts-glib:update
         <Update release="1">
             <Date>2016-03-30</Date>
             <Version>1.21</Version>