diff --git a/.files b/.files
index 59fb692..796959e 100644
Binary files a/.files and b/.files differ
diff --git a/.rev b/.rev
index b5784be..7550173 100644
--- a/.rev
+++ b/.rev
@@ -463,8 +463,6 @@
     <comment>KDE Applications 20.12.1</comment>
     <requestid>861096</requestid>
   </revision>
-<<<<<<< Updated upstream
-=======
   <revision rev="59" vrev="1">
     <srcmd5>980458dbf9a4d1617d959ad23a1e3840</srcmd5>
     <version>20.12.2</version>
@@ -481,5 +479,4 @@
     <comment>20.12.3 release</comment>
     <requestid>877009</requestid>
   </revision>
->>>>>>> Stashed changes
 </revisionlist>
diff --git a/akonadi-contact.changes b/akonadi-contact.changes
index 84d452a..efbe66a 100644
--- a/akonadi-contact.changes
+++ b/akonadi-contact.changes
@@ -1,6 +1,4 @@
 -------------------------------------------------------------------
-<<<<<<< Updated upstream
-=======
 Thu Mar  4 06:09:18 UTC 2021 - Luca Beltrame <lbeltrame@kde.org>
 
 - Update to 20.12.3
@@ -19,7 +17,6 @@ Wed Feb  3 08:27:37 UTC 2021 - Christophe Giboudeaux <christophe@krop.fr>
 - No code change since 20.12.1
 
 -------------------------------------------------------------------
->>>>>>> Stashed changes
 Tue Jan  5 12:24:28 UTC 2021 - Luca Beltrame <lbeltrame@kde.org>
 
 - Update to 20.12.1
diff --git a/akonadi-contact.spec b/akonadi-contact.spec
index 5df2526..ec18b92 100644
--- a/akonadi-contact.spec
+++ b/akonadi-contact.spec
@@ -23,11 +23,7 @@
 %{!?_kapp_version: %define _kapp_version %(echo %{version}| awk -F. '{print $1"."$2}')}
 %bcond_without lang
 Name:           akonadi-contact
-<<<<<<< Updated upstream
-Version:        20.12.1
-=======
 Version:        20.12.3
->>>>>>> Stashed changes
 Release:        0
 Summary:        KDE PIM Libraries for Akonadi Contacts
 License:        LGPL-2.1-or-later
diff --git a/akonadi-contacts-20.12.1.tar.xz b/akonadi-contacts-20.12.1.tar.xz
deleted file mode 120000
index bd98112..0000000
--- a/akonadi-contacts-20.12.1.tar.xz
+++ /dev/null
@@ -1 +0,0 @@
-/ipfs/bafybeihvkqosaipo6wteui76e5hlrllvqmqdlxd26r6ef2leicgpdbgam4
\ No newline at end of file
diff --git a/akonadi-contacts-20.12.1.tar.xz.sig b/akonadi-contacts-20.12.1.tar.xz.sig
deleted file mode 100644
index 58329c7..0000000
--- a/akonadi-contacts-20.12.1.tar.xz.sig
+++ /dev/null
@@ -1,11 +0,0 @@
------BEGIN PGP SIGNATURE-----
-
-iQEzBAABCgAdFiEE8jJ15L8Qr8HfaRSm29LOiT4tHIcFAl/zwekACgkQ29LOiT4t
-HId26gf9HX/ulXaGcUUe1KAl700crHt0BV/XJA1V1pQZJw4T1+EcPqfTIQyRVbMt
-O9yJdefkrmRL0Oe2BLTFtnmE/yT8ZzHBGa5gxwwgM7PNNsAhBEbgVbKmAqsycNwu
-wCN2y0tO3VGLv1HImUvpX29mAGxD2Lu8nOYFGnORIETO/BhQEv2VTX0Y6jucRmav
-mFNl7QWpXT4Lq4Gl4V8pU2U2NN17Uwlo6/4Af3/Ldmwyyffoin7b+3Y166+ss6y0
-oP0O+kshqbVv4E7PdCLlqNAy8NoIFo2eh31+EgOJOd7yukYT2KJlHNvW8s3MzIX0
-0FH6uDLOS2RuapIsFMIs26CBodwz5A==
-=8utL
------END PGP SIGNATURE-----