diff --git a/.files b/.files
index 556c9e2..15c02a8 100644
Binary files a/.files and b/.files differ
diff --git a/.rev b/.rev
index 3349e13..2735f36 100644
--- a/.rev
+++ b/.rev
@@ -431,8 +431,6 @@
     <comment>KDE Applications 20.12.1</comment>
     <requestid>861099</requestid>
   </revision>
-<<<<<<< Updated upstream
-=======
   <revision rev="55" vrev="1">
     <srcmd5>4fdd6bcd7bca101ee7639860e07cd23b</srcmd5>
     <version>20.12.2</version>
@@ -449,5 +447,4 @@
     <comment>20.12.3 release</comment>
     <requestid>877012</requestid>
   </revision>
->>>>>>> Stashed changes
 </revisionlist>
diff --git a/akonadi-notes-20.12.1.tar.xz b/akonadi-notes-20.12.1.tar.xz
deleted file mode 120000
index e067a4a..0000000
--- a/akonadi-notes-20.12.1.tar.xz
+++ /dev/null
@@ -1 +0,0 @@
-/ipfs/bafkreievt5uwiqd6aoab7ly3n5ldxf7nk77o3bpay3ctu45r7iesuh5csu
\ No newline at end of file
diff --git a/akonadi-notes-20.12.1.tar.xz.sig b/akonadi-notes-20.12.1.tar.xz.sig
deleted file mode 100644
index c62a0ee..0000000
--- a/akonadi-notes-20.12.1.tar.xz.sig
+++ /dev/null
@@ -1,11 +0,0 @@
------BEGIN PGP SIGNATURE-----
-
-iQEzBAABCgAdFiEE8jJ15L8Qr8HfaRSm29LOiT4tHIcFAl/zwekACgkQ29LOiT4t
-HIdxVgf/c290WZ9/vSNDwN9tWnjGJ1kA0+uOPi+ZzCx4rs7MGikgzlRG0ODnKLET
-uirKqKe36a4lBjnpIbQf+b7fqW6HOmOZynhqA6pm9HNamu7SsQTL3rSuQNXrf5nK
-0qeXS4mnOOcsygs79yjOcrBzZU2UIs/ndScSiMGxnRPZHMrf6GDAOohALNxA30K8
-idgEMp3znO3YBXUQuFi6/XxmkG1GbvEluQNftIryhde2qFRMfJVRcnChyTLaP/Sg
-+Nqxrjj4by/QCH4xH+vUa/4uQJG/WZS9K0lEUdmsjmcA4eSFFxb1mtG2YhKxqCA6
-vGk2PQYiI2C4gYOrUguvIMFOLqrT9g==
-=dEdv
------END PGP SIGNATURE-----
diff --git a/akonadi-notes.changes b/akonadi-notes.changes
index e2ba92f..9dee465 100644
--- a/akonadi-notes.changes
+++ b/akonadi-notes.changes
@@ -1,6 +1,4 @@
 -------------------------------------------------------------------
-<<<<<<< Updated upstream
-=======
 Thu Mar  4 06:09:20 UTC 2021 - Luca Beltrame <lbeltrame@kde.org>
 
 - Update to 20.12.3
@@ -19,7 +17,6 @@ Wed Feb  3 08:27:39 UTC 2021 - Christophe Giboudeaux <christophe@krop.fr>
 - No code change since 20.12.1
 
 -------------------------------------------------------------------
->>>>>>> Stashed changes
 Tue Jan  5 12:24:31 UTC 2021 - Luca Beltrame <lbeltrame@kde.org>
 
 - Update to 20.12.1
diff --git a/akonadi-notes.spec b/akonadi-notes.spec
index b242e8a..1bc5ba7 100644
--- a/akonadi-notes.spec
+++ b/akonadi-notes.spec
@@ -21,11 +21,7 @@
 %{!?_kapp_version: %define _kapp_version %(echo %{version}| awk -F. '{print $1"."$2}')}
 %bcond_without lang
 Name:           akonadi-notes
-<<<<<<< Updated upstream
-Version:        20.12.1
-=======
 Version:        20.12.3
->>>>>>> Stashed changes
 Release:        0
 Summary:        Library to implement management of notes in Akonadi
 License:        LGPL-2.1-or-later