diff --git a/.files b/.files
index 3356dc6..1d54055 100644
Binary files a/.files and b/.files differ
diff --git a/.rev b/.rev
index a52d425..d93ea27 100644
--- a/.rev
+++ b/.rev
@@ -1117,8 +1117,6 @@ https://git.reviewboard.kde.org/r/104878/ (forwarded request 116659 from StefanB
     <comment>new snapshot</comment>
     <requestid>858096</requestid>
   </revision>
-<<<<<<< Updated upstream
-=======
   <revision rev="126" vrev="1">
     <srcmd5>f0e93e20f7fd38986b53ed4fb405ac74</srcmd5>
     <version>2.9.75git.20210220T172242~b94c362c1d</version>
@@ -1140,5 +1138,23 @@ https://git.reviewboard.kde.org/r/104878/ (forwarded request 116659 from StefanB
 - Update translations</comment>
     <requestid>874790</requestid>
   </revision>
->>>>>>> Stashed changes
+  <revision rev="127" vrev="1">
+    <srcmd5>7367f840d6f06ea884bbe104033bb8dd</srcmd5>
+    <version>2.9.75git.20210626T134054~59b22189f6</version>
+    <time>1625429442</time>
+    <user>dimstar_suse</user>
+    <comment>- Update to version 2.9.75git.20210626T134054~59b22189f6:
+  * Scan history of played tracks till find a playble track (kde#438651)
+  * Prevent Signal from kRichTextEdit during deletion
+  * Prevent Amarok from stalling if the standard playing mode is used
+    and next (or previous) file does not exist
+  * Update IRC network
+  * Drop unused KF5NotifyConfig
+  * Fix crash when reloading scriptable services
+  * Replace deprecated toList() with values()
+  * Add .gitlab-ci.yml
+  * Drop all the amarok-neon packaging bits
+  * Fix disambiguation found by gettext 0.21</comment>
+    <requestid>903742</requestid>
+  </revision>
 </revisionlist>
diff --git a/.servicemark b/.servicemark
index fbce6b3..9149fb2 100644
--- a/.servicemark
+++ b/.servicemark
@@ -1,5 +1 @@
-<<<<<<< Updated upstream
-75b9c1e10fa830ee021c5d071caa8bc0
-=======
-a0b9f9ec8f7133eb4c23b6b4f1976c33
->>>>>>> Stashed changes
+4620ea13d44650829da33373aaf07c16
diff --git a/_servicedata b/_servicedata
index 129d2cf..14e7e85 100644
--- a/_servicedata
+++ b/_servicedata
@@ -1,8 +1,4 @@
 <servicedata>
 <service name="tar_scm">
                 <param name="url">https://invent.kde.org/multimedia/amarok.git</param>
-<<<<<<< Updated upstream
-              <param name="changesrevision">89d13c15ad9ed68189a7399f7fa79637be30c675</param></service></servicedata>
-=======
-              <param name="changesrevision">b94c362c1dc3250025c52588a5ed28a84665dd6d</param></service></servicedata>
->>>>>>> Stashed changes
+              <param name="changesrevision">053657d827d5eceb427b5fdb3ab74771d005acee</param></service></servicedata>
\ No newline at end of file
diff --git a/amarok-2.9.70git.20201222T022603~89d13c15ad.tar.xz b/amarok-2.9.70git.20201222T022603~89d13c15ad.tar.xz
deleted file mode 120000
index 7421156..0000000
--- a/amarok-2.9.70git.20201222T022603~89d13c15ad.tar.xz
+++ /dev/null
@@ -1 +0,0 @@
-/ipfs/bafybeifgo4ugw3wwayer6und5e4ypaag7rpp6226b3h5schz3upr3ddt3y
\ No newline at end of file
diff --git a/amarok-2.9.75git.20210220T172242~b94c362c1d.tar.xz b/amarok-2.9.75git.20210220T172242~b94c362c1d.tar.xz
deleted file mode 120000
index e8316f8..0000000
--- a/amarok-2.9.75git.20210220T172242~b94c362c1d.tar.xz
+++ /dev/null
@@ -1 +0,0 @@
-/ipfs/bafybeibn4vskdxcbpi4gm7rvhypb2hkt77l6u3v5djpxvjdlaobpevdjyy
\ No newline at end of file
diff --git a/amarok-2.9.75git.20210626T134054~59b22189f6.tar.xz b/amarok-2.9.75git.20210626T134054~59b22189f6.tar.xz
new file mode 120000
index 0000000..2ab6e3e
--- /dev/null
+++ b/amarok-2.9.75git.20210626T134054~59b22189f6.tar.xz
@@ -0,0 +1 @@
+/ipfs/bafybeihpd2bklksgkcjp74anmwnsq6svheutpghqec67hsi7btdc6jgo6q
\ No newline at end of file
diff --git a/amarok-lang.tar.xz b/amarok-lang.tar.xz
index 117edeb..016780c 120000
--- a/amarok-lang.tar.xz
+++ b/amarok-lang.tar.xz
@@ -1 +1 @@
-/ipfs/bafybeihyavayl7vaegwerdkgq73v4jskpgv7n3quwye2ro26guloxx5fpe
\ No newline at end of file
+/ipfs/bafybeigebhyzxxwphiti4pjly6e6xxews7ckgl4o7tgwkukufl556onz2q
\ No newline at end of file
diff --git a/amarok.changes b/amarok.changes
index ad9b2aa..3f1aead 100644
--- a/amarok.changes
+++ b/amarok.changes
@@ -1,6 +1,20 @@
 -------------------------------------------------------------------
-<<<<<<< Updated upstream
-=======
+Fri Jul 02 14:27:25 UTC 2021 - christophe@krop.fr
+
+- Update to version 2.9.75git.20210626T134054~59b22189f6:
+  * Scan history of played tracks till find a playble track (kde#438651)
+  * Prevent Signal from kRichTextEdit during deletion
+  * Prevent Amarok from stalling if the standard playing mode is used
+    and next (or previous) file does not exist
+  * Update IRC network
+  * Drop unused KF5NotifyConfig
+  * Fix crash when reloading scriptable services
+  * Replace deprecated toList() with values()
+  * Add .gitlab-ci.yml
+  * Drop all the amarok-neon packaging bits
+  * Fix disambiguation found by gettext 0.21
+
+-------------------------------------------------------------------
 Wed Feb 24 08:50:43 UTC 2021 - christophe@krop.fr
 
 - Update to version 2.9.70git.20210220T172242~b94c362c1d:
@@ -19,7 +33,6 @@ Wed Feb 24 08:50:43 UTC 2021 - christophe@krop.fr
 - Update translations
 
 -------------------------------------------------------------------
->>>>>>> Stashed changes
 Tue Dec 22 09:12:56 UTC 2020 - christophe@krop.fr
 
 - Update to version 2.9.70git.20201222T022603~89d13c15ad:
diff --git a/amarok.spec b/amarok.spec
index f5fc243..cf1c9df 100644
--- a/amarok.spec
+++ b/amarok.spec
@@ -17,11 +17,7 @@
 
 
 Name:           amarok
-<<<<<<< Updated upstream
-Version:        2.9.70git.20201222T022603~89d13c15ad
-=======
-Version:        2.9.75git.20210220T172242~b94c362c1d
->>>>>>> Stashed changes
+Version:        2.9.75git.20210626T134054~59b22189f6
 Release:        0
 Summary:        Media Player
 License:        GPL-2.0-or-later
@@ -65,7 +61,6 @@ BuildRequires:  cmake(KF5KCMUtils)
 BuildRequires:  cmake(KF5KIO)
 BuildRequires:  cmake(KF5NewStuff)
 BuildRequires:  cmake(KF5Notifications)
-BuildRequires:  cmake(KF5NotifyConfig)
 BuildRequires:  cmake(KF5Package)
 BuildRequires:  cmake(KF5Solid)
 BuildRequires:  cmake(KF5TextEditor)
@@ -107,8 +102,8 @@ Requires:       kirigami2
 Requires:       libqt5-qtquickcontrols2
 Requires:       libtag-extras1 >= 1.0
 Recommends:     %{name}-lang = %{version}
-Recommends:     (gstreamer-plugins-ugly if phonon4qt5-backend-gstreamer)
 Recommends:     moodbar
+Recommends:     (gstreamer-plugins-ugly if phonon4qt5-backend-gstreamer)
 
 %description
 Amarok is a media player for all kinds of media. This includes MP3, Ogg