diff --git a/.rev b/.rev
index 60f4939..109248a 100644
--- a/.rev
+++ b/.rev
@@ -6846,7 +6846,6 @@
     <user>staging-bot</user>
     <comment>Automatic update</comment>
   </revision>
-<<<<<<< Updated upstream
   <revision rev="979" vrev="979">
     <srcmd5>9207c81a2daca42dd4284fc5e24b0de5</srcmd5>
     <version>unknown</version>
@@ -6938,6 +6937,4 @@
     <user>staging-bot</user>
     <comment>Automatic update</comment>
   </revision>
-=======
->>>>>>> Stashed changes
 </revisionlist>
diff --git a/.servicemark b/.servicemark
index fcc64e9..cfe1dfa 100644
--- a/.servicemark
+++ b/.servicemark
@@ -1,5 +1 @@
-<<<<<<< Updated upstream
 890017e157358ab173554a1c0574f4d2
-=======
-ef63c03f7bf1f6f446e8ce506f3994f8
->>>>>>> Stashed changes
diff --git a/MicroOS-release.spec b/MicroOS-release.spec
index df62ee0..e8fd3fb 100644
--- a/MicroOS-release.spec
+++ b/MicroOS-release.spec
@@ -17,11 +17,7 @@
 
 
 Name:           MicroOS-release
-<<<<<<< Updated upstream
 Version:        20210520
-=======
-Version:        20210510
->>>>>>> Stashed changes
 Release:        0
 Summary:        openSUSE MicroOS 
 License:        GPL-2.0-or-later
@@ -180,15 +176,9 @@ ExclusiveArch:  %ix86 x86_64 ppc64le s390x aarch64 %arm
 %include %{SOURCE100}
 Provides:       %name-%version
 Provides:       product() = MicroOS
-<<<<<<< Updated upstream
 Provides:       product(MicroOS) = 20210520-0
 Provides:       product-label() = openSUSE%20MicroOS
 Provides:       product-cpeid() = cpe%3A%2Fo%3Aopensuse%3Amicroos%3A20210520
-=======
-Provides:       product(MicroOS) = 20210510-0
-Provides:       product-label() = openSUSE%20MicroOS
-Provides:       product-cpeid() = cpe%3A%2Fo%3Aopensuse%3Amicroos%3A20210510
->>>>>>> Stashed changes
 Provides:       product-url(releasenotes) = http%3A%2F%2Fdoc.opensuse.org%2Frelease%2Dnotes%2Fx86_64%2FopenSUSE%2FTumbleweed%2Frelease%2Dnotes%2DopenSUSE.rpm
 Provides:       product-endoflife()
 Requires:       product_flavor(MicroOS)
@@ -204,11 +194,7 @@ License:        BSD-3-Clause
 Group:          System/Fhs
 Provides:       product_flavor()
 Provides:       flavor(dvd)
-<<<<<<< Updated upstream
 Provides:       product_flavor(MicroOS) = 20210520-0
-=======
-Provides:       product_flavor(MicroOS) = 20210510-0
->>>>>>> Stashed changes
 Summary:        openSUSE MicroOS%{?betaversion: %{betaversion}}
 
 %description dvd
@@ -224,11 +210,7 @@ License:        BSD-3-Clause
 Group:          System/Fhs
 Provides:       product_flavor()
 Provides:       flavor(kubic-dvd)
-<<<<<<< Updated upstream
 Provides:       product_flavor(MicroOS) = 20210520-0
-=======
-Provides:       product_flavor(MicroOS) = 20210510-0
->>>>>>> Stashed changes
 Summary:        openSUSE MicroOS%{?betaversion: %{betaversion}}
 
 %description kubic-dvd
@@ -244,11 +226,7 @@ License:        BSD-3-Clause
 Group:          System/Fhs
 Provides:       product_flavor()
 Provides:       flavor(appliance)
-<<<<<<< Updated upstream
 Provides:       product_flavor(MicroOS) = 20210520-0
-=======
-Provides:       product_flavor(MicroOS) = 20210510-0
->>>>>>> Stashed changes
 Summary:        openSUSE MicroOS%{?betaversion: %{betaversion}}
 
 %description appliance
@@ -264,11 +242,7 @@ License:        BSD-3-Clause
 Group:          System/Fhs
 Provides:       product_flavor()
 Provides:       flavor(appliance-kubic)
-<<<<<<< Updated upstream
 Provides:       product_flavor(MicroOS) = 20210520-0
-=======
-Provides:       product_flavor(MicroOS) = 20210510-0
->>>>>>> Stashed changes
 Summary:        openSUSE MicroOS%{?betaversion: %{betaversion}}
 
 %description appliance-kubic
@@ -327,19 +301,11 @@ cat >$RPM_BUILD_ROOT/etc/products.d/MicroOS.prod << EOF
 <product schemeversion="0">
   <vendor>openSUSE</vendor>
   <name>MicroOS</name>
-<<<<<<< Updated upstream
   <version>20210520</version>
   <release>0</release>
   <endoflife></endoflife>
   <arch>%{_target_cpu}</arch>
   <cpeid>cpe:/o:opensuse:microos:20210520</cpeid>
-=======
-  <version>20210510</version>
-  <release>0</release>
-  <endoflife></endoflife>
-  <arch>%{_target_cpu}</arch>
-  <cpeid>cpe:/o:opensuse:microos:20210510</cpeid>
->>>>>>> Stashed changes
   <productline>MicroOS</productline>
   <register>
     <pool>
diff --git a/openSUSE-Addon-NonOss-release.spec b/openSUSE-Addon-NonOss-release.spec
index fc2621e..c737f73 100644
--- a/openSUSE-Addon-NonOss-release.spec
+++ b/openSUSE-Addon-NonOss-release.spec
@@ -1,9 +1,5 @@
 #
-<<<<<<< Updated upstream
 # spec file for package openSUSE-Addon-NonOss-release (Version 20210520)
-=======
-# spec file for package openSUSE-Addon-NonOss-release (Version 20210510)
->>>>>>> Stashed changes
 #
 # Copyright (c) 2021 openSUSE.
 #
@@ -20,26 +16,16 @@
 Name:           openSUSE-Addon-NonOss-release
 %define         product openSUSE-Addon-NonOss
 Summary:        openSUSE NonOSS Addon%{?betaversion: %{betaversion}}
-<<<<<<< Updated upstream
 Version:        20210520
-=======
-Version:        20210510
->>>>>>> Stashed changes
 Release:        0
 License:        BSD-3-Clause
 Group:          System/Fhs
 
 Provides:       %name-%version
 Provides:       product() = openSUSE-Addon-NonOss
-<<<<<<< Updated upstream
 Provides:       product(openSUSE-Addon-NonOss) = 20210520-0
 Provides:       product-label() = non%20oss%20addon
 Provides:       product-cpeid() = cpe%3A%2Fo%3Aopensuse%3Aopensuse%2Daddon%2Dnonoss%3A20210520
-=======
-Provides:       product(openSUSE-Addon-NonOss) = 20210510-0
-Provides:       product-label() = non%20oss%20addon
-Provides:       product-cpeid() = cpe%3A%2Fo%3Aopensuse%3Aopensuse%2Daddon%2Dnonoss%3A20210510
->>>>>>> Stashed changes
 
 
 AutoReqProv:    on
@@ -63,17 +49,10 @@ cat >$RPM_BUILD_ROOT/etc/products.d/openSUSE-Addon-NonOss.prod << EOF
 <product schemeversion="0">
   <vendor>openSUSE</vendor>
   <name>openSUSE-Addon-NonOss</name>
-<<<<<<< Updated upstream
   <version>20210520</version>
   <release>0</release>
   <arch>%{_target_cpu}</arch>
   <cpeid>cpe:/o:opensuse:opensuse-addon-nonoss:20210520</cpeid>
-=======
-  <version>20210510</version>
-  <release>0</release>
-  <arch>%{_target_cpu}</arch>
-  <cpeid>cpe:/o:opensuse:opensuse-addon-nonoss:20210510</cpeid>
->>>>>>> Stashed changes
   <register>
     <pool>
     </pool>
diff --git a/openSUSE-release.spec b/openSUSE-release.spec
index 97d4280..6e9192a 100644
--- a/openSUSE-release.spec
+++ b/openSUSE-release.spec
@@ -20,11 +20,7 @@
 #define betaversion %{nil}
 %define codename Tumbleweed
 Name:           openSUSE-release
-<<<<<<< Updated upstream
 Version:        20210520
-=======
-Version:        20210510
->>>>>>> Stashed changes
 Release:        0
 # 0 is the product release, not the build release of this package
 Summary:        openSUSE Tumbleweed
@@ -182,11 +178,7 @@ Provides:       weakremover(openssl-debuginfo)
 %include %{SOURCE100}
 Provides:       %name-%version
 Provides:       product() = openSUSE
-<<<<<<< Updated upstream
 Provides:       product(openSUSE) = 20210520-0
-=======
-Provides:       product(openSUSE) = 20210510-0
->>>>>>> Stashed changes
 %ifarch x86_64
 Provides:       product-register-target() = openSUSE%2DTumbleweed%2Dx86_64
 %endif
@@ -200,11 +192,7 @@ Provides:       product-register-target() = openSUSE%2DTumbleweed%2Dppc64le
 Provides:       product-register-target() = openSUSE%2DTumbleweed%2Daarch64
 %endif
 Provides:       product-label() = openSUSE
-<<<<<<< Updated upstream
 Provides:       product-cpeid() = cpe%3A%2Fo%3Aopensuse%3Aopensuse%3A20210520
-=======
-Provides:       product-cpeid() = cpe%3A%2Fo%3Aopensuse%3Aopensuse%3A20210510
->>>>>>> Stashed changes
 Provides:       product-url(releasenotes) = http%3A%2F%2Fdoc.opensuse.org%2Frelease%2Dnotes%2Fx86_64%2FopenSUSE%2FTumbleweed%2Frelease%2Dnotes%2DopenSUSE.rpm
 Provides:       product-url(repository) = http%3A%2F%2Fdownload.opensuse.org%2Ftumbleweed%2Frepo%2Foss%2F
 Requires:       product_flavor(openSUSE)
@@ -218,11 +206,7 @@ License:        BSD-3-Clause
 Group:          System/Fhs
 Provides:       product_flavor()
 Provides:       flavor(ftp)
-<<<<<<< Updated upstream
 Provides:       product_flavor(openSUSE) = 20210520-0
-=======
-Provides:       product_flavor(openSUSE) = 20210510-0
->>>>>>> Stashed changes
 Summary:        openSUSE Tumbleweed%{?betaversion: %{betaversion}}
 
 %description ftp
@@ -237,11 +221,7 @@ License:        BSD-3-Clause
 Group:          System/Fhs
 Provides:       product_flavor()
 Provides:       flavor(mini)
-<<<<<<< Updated upstream
 Provides:       product_flavor(openSUSE) = 20210520-0
-=======
-Provides:       product_flavor(openSUSE) = 20210510-0
->>>>>>> Stashed changes
 Summary:        openSUSE Tumbleweed%{?betaversion: %{betaversion}}
 
 %description mini
@@ -256,11 +236,7 @@ License:        BSD-3-Clause
 Group:          System/Fhs
 Provides:       product_flavor()
 Provides:       flavor(dvd)
-<<<<<<< Updated upstream
 Provides:       product_flavor(openSUSE) = 20210520-0
-=======
-Provides:       product_flavor(openSUSE) = 20210510-0
->>>>>>> Stashed changes
 Summary:        openSUSE Tumbleweed%{?betaversion: %{betaversion}}
 
 %description dvd
@@ -275,11 +251,7 @@ License:        BSD-3-Clause
 Group:          System/Fhs
 Provides:       product_flavor()
 Provides:       flavor(livecd-kde)
-<<<<<<< Updated upstream
 Provides:       product_flavor(openSUSE) = 20210520-0
-=======
-Provides:       product_flavor(openSUSE) = 20210510-0
->>>>>>> Stashed changes
 Summary:        openSUSE Tumbleweed%{?betaversion: %{betaversion}}
 
 %description livecd-kde
@@ -294,11 +266,7 @@ License:        BSD-3-Clause
 Group:          System/Fhs
 Provides:       product_flavor()
 Provides:       flavor(livecd-x11)
-<<<<<<< Updated upstream
 Provides:       product_flavor(openSUSE) = 20210520-0
-=======
-Provides:       product_flavor(openSUSE) = 20210510-0
->>>>>>> Stashed changes
 Summary:        openSUSE Tumbleweed%{?betaversion: %{betaversion}}
 
 %description livecd-x11
@@ -313,11 +281,7 @@ License:        BSD-3-Clause
 Group:          System/Fhs
 Provides:       product_flavor()
 Provides:       flavor(livecd-gnome)
-<<<<<<< Updated upstream
 Provides:       product_flavor(openSUSE) = 20210520-0
-=======
-Provides:       product_flavor(openSUSE) = 20210510-0
->>>>>>> Stashed changes
 Summary:        openSUSE Tumbleweed%{?betaversion: %{betaversion}}
 
 %description livecd-gnome
@@ -332,11 +296,7 @@ License:        BSD-3-Clause
 Group:          System/Fhs
 Provides:       product_flavor()
 Provides:       flavor(livecd-xfce)
-<<<<<<< Updated upstream
 Provides:       product_flavor(openSUSE) = 20210520-0
-=======
-Provides:       product_flavor(openSUSE) = 20210510-0
->>>>>>> Stashed changes
 Summary:        openSUSE Tumbleweed%{?betaversion: %{betaversion}}
 
 %description livecd-xfce
@@ -351,11 +311,7 @@ License:        BSD-3-Clause
 Group:          System/Fhs
 Provides:       product_flavor()
 Provides:       flavor(usb-kde)
-<<<<<<< Updated upstream
 Provides:       product_flavor(openSUSE) = 20210520-0
-=======
-Provides:       product_flavor(openSUSE) = 20210510-0
->>>>>>> Stashed changes
 Summary:        openSUSE Tumbleweed%{?betaversion: %{betaversion}}
 
 %description usb-kde
@@ -370,11 +326,7 @@ License:        BSD-3-Clause
 Group:          System/Fhs
 Provides:       product_flavor()
 Provides:       flavor(usb-gnome)
-<<<<<<< Updated upstream
 Provides:       product_flavor(openSUSE) = 20210520-0
-=======
-Provides:       product_flavor(openSUSE) = 20210510-0
->>>>>>> Stashed changes
 Summary:        openSUSE Tumbleweed%{?betaversion: %{betaversion}}
 
 %description usb-gnome
@@ -389,11 +341,7 @@ License:        BSD-3-Clause
 Group:          System/Fhs
 Provides:       product_flavor()
 Provides:       flavor(usb-x11)
-<<<<<<< Updated upstream
 Provides:       product_flavor(openSUSE) = 20210520-0
-=======
-Provides:       product_flavor(openSUSE) = 20210510-0
->>>>>>> Stashed changes
 Summary:        openSUSE Tumbleweed%{?betaversion: %{betaversion}}
 
 %description usb-x11
@@ -408,11 +356,7 @@ License:        BSD-3-Clause
 Group:          System/Fhs
 Provides:       product_flavor()
 Provides:       flavor(appliance)
-<<<<<<< Updated upstream
 Provides:       product_flavor(openSUSE) = 20210520-0
-=======
-Provides:       product_flavor(openSUSE) = 20210510-0
->>>>>>> Stashed changes
 Summary:        openSUSE Tumbleweed%{?betaversion: %{betaversion}}
 
 %description appliance
@@ -427,11 +371,7 @@ License:        BSD-3-Clause
 Group:          System/Fhs
 Provides:       product_flavor()
 Provides:       flavor(appliance-docker)
-<<<<<<< Updated upstream
 Provides:       product_flavor(openSUSE) = 20210520-0
-=======
-Provides:       product_flavor(openSUSE) = 20210510-0
->>>>>>> Stashed changes
 Summary:        openSUSE Tumbleweed%{?betaversion: %{betaversion}}
 
 %description appliance-docker
@@ -446,11 +386,7 @@ License:        BSD-3-Clause
 Group:          System/Fhs
 Provides:       product_flavor()
 Provides:       flavor(appliance-kvm)
-<<<<<<< Updated upstream
 Provides:       product_flavor(openSUSE) = 20210520-0
-=======
-Provides:       product_flavor(openSUSE) = 20210510-0
->>>>>>> Stashed changes
 Summary:        openSUSE Tumbleweed%{?betaversion: %{betaversion}}
 
 %description appliance-kvm
@@ -465,11 +401,7 @@ License:        BSD-3-Clause
 Group:          System/Fhs
 Provides:       product_flavor()
 Provides:       flavor(appliance-vmware)
-<<<<<<< Updated upstream
 Provides:       product_flavor(openSUSE) = 20210520-0
-=======
-Provides:       product_flavor(openSUSE) = 20210510-0
->>>>>>> Stashed changes
 Summary:        openSUSE Tumbleweed%{?betaversion: %{betaversion}}
 
 %description appliance-vmware
@@ -484,11 +416,7 @@ License:        BSD-3-Clause
 Group:          System/Fhs
 Provides:       product_flavor()
 Provides:       flavor(appliance-openstack)
-<<<<<<< Updated upstream
 Provides:       product_flavor(openSUSE) = 20210520-0
-=======
-Provides:       product_flavor(openSUSE) = 20210510-0
->>>>>>> Stashed changes
 Summary:        openSUSE Tumbleweed%{?betaversion: %{betaversion}}
 
 %description appliance-openstack
@@ -503,11 +431,7 @@ License:        BSD-3-Clause
 Group:          System/Fhs
 Provides:       product_flavor()
 Provides:       flavor(appliance-hyperv)
-<<<<<<< Updated upstream
 Provides:       product_flavor(openSUSE) = 20210520-0
-=======
-Provides:       product_flavor(openSUSE) = 20210510-0
->>>>>>> Stashed changes
 Summary:        openSUSE Tumbleweed%{?betaversion: %{betaversion}}
 
 %description appliance-hyperv
@@ -522,11 +446,7 @@ License:        BSD-3-Clause
 Group:          System/Fhs
 Provides:       product_flavor()
 Provides:       flavor(appliance-vagrant)
-<<<<<<< Updated upstream
 Provides:       product_flavor(openSUSE) = 20210520-0
-=======
-Provides:       product_flavor(openSUSE) = 20210510-0
->>>>>>> Stashed changes
 Summary:        openSUSE Tumbleweed%{?betaversion: %{betaversion}}
 
 %description appliance-vagrant
@@ -541,11 +461,7 @@ License:        BSD-3-Clause
 Group:          System/Fhs
 Provides:       product_flavor()
 Provides:       flavor(appliance-wsl)
-<<<<<<< Updated upstream
 Provides:       product_flavor(openSUSE) = 20210520-0
-=======
-Provides:       product_flavor(openSUSE) = 20210510-0
->>>>>>> Stashed changes
 Summary:        openSUSE Tumbleweed%{?betaversion: %{betaversion}}
 
 %description appliance-wsl
@@ -560,11 +476,7 @@ License:        BSD-3-Clause
 Group:          System/Fhs
 Provides:       product_flavor()
 Provides:       flavor(appliance-custom)
-<<<<<<< Updated upstream
 Provides:       product_flavor(openSUSE) = 20210520-0
-=======
-Provides:       product_flavor(openSUSE) = 20210510-0
->>>>>>> Stashed changes
 Summary:        openSUSE Tumbleweed%{?betaversion: %{betaversion}}
 
 %description appliance-custom
@@ -639,17 +551,10 @@ cat >$RPM_BUILD_ROOT/etc/products.d/openSUSE.prod << EOF
 <product schemeversion="0">
   <vendor>openSUSE</vendor>
   <name>openSUSE</name>
-<<<<<<< Updated upstream
   <version>20210520</version>
   <release>0</release>
   <arch>%{_target_cpu}</arch>
   <cpeid>cpe:/o:opensuse:opensuse:20210520</cpeid>
-=======
-  <version>20210510</version>
-  <release>0</release>
-  <arch>%{_target_cpu}</arch>
-  <cpeid>cpe:/o:opensuse:opensuse:20210510</cpeid>
->>>>>>> Stashed changes
   <productline>openSUSE</productline>
   <register>
     <pool>
diff --git a/weakremovers.inc b/weakremovers.inc
index 8aa8828..d89d116 100644
--- a/weakremovers.inc
+++ b/weakremovers.inc
@@ -4120,7 +4120,6 @@ Provides: weakremover(cmpi-pywbem-base)
 Provides: weakremover(cmpi-pywbem-power-management)
 Provides: weakremover(cmpi-pywbem-software)
 Provides: weakremover(cobbler-web)
-Provides: weakremover(cockpit-machines)
 Provides: weakremover(collectd-plugin-lvm)
 Provides: weakremover(collectd-plugin-python)
 Provides: weakremover(colorblind-devel)
@@ -27843,8 +27842,6 @@ Provides: weakremover(xmonad)
 %ifarch x86_64
 Provides: weakremover(96BoardsGPIO-common)
 Provides: weakremover(96BoardsGPIO-devel)
-Provides: weakremover(Mesa-vulkan-device-select-32bit)
-Provides: weakremover(Mesa-vulkan-overlay-32bit)
 Provides: weakremover(SVT-AV1)
 Provides: weakremover(SVT-AV1-devel)
 Provides: weakremover(allegro-dga2-plugin-32bit)