diff --git a/.files b/.files
index 78e098f..2d3018e 100644
Binary files a/.files and b/.files differ
diff --git a/.rev b/.rev
index ec1da60..1ff91eb 100644
--- a/.rev
+++ b/.rev
@@ -69,8 +69,6 @@
862962
-<<<<<<< Updated upstream
-=======
1d011410815f52b6fe111e69e38445be
1.2.1
@@ -88,5 +86,4 @@
* Define ADWAITAQT_INCLUDE_DIRS variable
885673
->>>>>>> Stashed changes
diff --git a/adwaita-qt-1.2.0.tar.gz b/adwaita-qt-1.2.0.tar.gz
deleted file mode 120000
index 9a202b8..0000000
--- a/adwaita-qt-1.2.0.tar.gz
+++ /dev/null
@@ -1 +0,0 @@
-/ipfs/bafybeicf5zap44eebab4n73mdxkg5dqe7c54b7ed4hfxktvhch6pwuzwri
\ No newline at end of file
diff --git a/adwaita-qt.changes b/adwaita-qt.changes
index e4d4bd0..c0cc55a 100644
--- a/adwaita-qt.changes
+++ b/adwaita-qt.changes
@@ -1,6 +1,4 @@
-------------------------------------------------------------------
-<<<<<<< Updated upstream
-=======
Thu Apr 15 13:36:48 UTC 2021 - Dominique Leuenberger
- Fix SLPP package name:
@@ -18,7 +16,6 @@ Tue Apr 13 19:48:34 UTC 2021 - Ferdinand Thiessen
* Define ADWAITAQT_INCLUDE_DIRS variable
-------------------------------------------------------------------
->>>>>>> Stashed changes
Tue Jan 5 21:14:33 UTC 2021 - Matthias Eliasson
- Update to 1.2.0
diff --git a/adwaita-qt.spec b/adwaita-qt.spec
index f8c05f3..6c051a5 100644
--- a/adwaita-qt.spec
+++ b/adwaita-qt.spec
@@ -17,15 +17,9 @@
#
-<<<<<<< Updated upstream
-%define sover 1_2_0
-Name: adwaita-qt
-Version: 1.2.0
-=======
%define sover 1
Name: adwaita-qt
Version: 1.2.1
->>>>>>> Stashed changes
Release: 0
Summary: Adwaita theme for Qt-based applications
License: GPL-2.0-or-later AND LGPL-2.1-or-later
@@ -33,11 +27,7 @@ URL: https://github.com/FedoraQt/adwaita-qt
Source0: %{url}/archive/%{version}/%{name}-%{version}.tar.gz
BuildRequires: cmake
BuildRequires: fdupes
-<<<<<<< Updated upstream
-BuildRequires: libqt5-qtbase-devel
-=======
BuildRequires: libqt5-qtbase-devel >= 5.12
->>>>>>> Stashed changes
BuildRequires: libqt5-qtx11extras-devel
BuildRequires: libxcb-devel
Requires: adwaita-qt5
@@ -56,13 +46,10 @@ Adwaita theme variant for applications utilizing Qt5
%package -n libadwaitaqt%{sover}
Summary: Adwaita Qt5 library
-<<<<<<< Updated upstream
-=======
# The package was wwronlgy called libadwaitaqt1_2_0 in the past
# As long as we are at .so.1, we can obsolete this old, wrong
# package name
Obsoletes: libadwaitaqt1_2_0
->>>>>>> Stashed changes
%description -n libadwaitaqt%{sover}
Adwaita theme variant for applications utilizing Qt5