diff --git a/.rev b/.rev
index bf7c0d9..214890f 100644
--- a/.rev
+++ b/.rev
@@ -6814,7 +6814,10 @@
 <<<<<<< Updated upstream
 <<<<<<< Updated upstream
 <<<<<<< Updated upstream
+<<<<<<< Updated upstream
+=======
 =======
+>>>>>>> Stashed changes
 =======
 >>>>>>> Stashed changes
 =======
@@ -6828,10 +6831,13 @@
   </revision>
 <<<<<<< Updated upstream
 <<<<<<< Updated upstream
+<<<<<<< Updated upstream
 >>>>>>> Stashed changes
 =======
 =======
 >>>>>>> Stashed changes
+=======
+>>>>>>> Stashed changes
   <revision rev="975" vrev="975">
     <srcmd5>7855cb2000221cbee5308ae47bdecac3</srcmd5>
     <version>unknown</version>
@@ -6840,8 +6846,11 @@
     <comment>Automatic update</comment>
   </revision>
 <<<<<<< Updated upstream
+<<<<<<< Updated upstream
 >>>>>>> Stashed changes
 =======
+=======
+>>>>>>> Stashed changes
   <revision rev="976" vrev="976">
     <srcmd5>2c8691a952e8275668bdb466a4fe5b15</srcmd5>
     <version>unknown</version>
@@ -6849,5 +6858,15 @@
     <user>staging-bot</user>
     <comment>Automatic update</comment>
   </revision>
+<<<<<<< Updated upstream
+>>>>>>> Stashed changes
+=======
+  <revision rev="977" vrev="977">
+    <srcmd5>f70553a8388e7166f04329e0891fbbd2</srcmd5>
+    <version>unknown</version>
+    <time>1620699516</time>
+    <user>staging-bot</user>
+    <comment>Automatic update</comment>
+  </revision>
 >>>>>>> Stashed changes
 </revisionlist>
diff --git a/.servicemark b/.servicemark
index 77800b0..c5a2377 100644
--- a/.servicemark
+++ b/.servicemark
@@ -1,6 +1,7 @@
 <<<<<<< Updated upstream
 <<<<<<< Updated upstream
 <<<<<<< Updated upstream
+<<<<<<< Updated upstream
 8974c5e31f55a0c863cce2a213e80ea1
 =======
 cc4598d1611e7429d4cbcd1a6e0e73e7
@@ -11,3 +12,6 @@ eb97875a5ed70118fda5b31fc2b1e450
 =======
 1f99ca6895bc64e1156a0829c74ed9c1
 >>>>>>> Stashed changes
+=======
+8752bb8a5d119847b4e2fa22db417a25
+>>>>>>> Stashed changes
diff --git a/MicroOS-release.spec b/MicroOS-release.spec
index 5e67d99..85b087a 100644
--- a/MicroOS-release.spec
+++ b/MicroOS-release.spec
@@ -20,6 +20,7 @@ Name:           MicroOS-release
 <<<<<<< Updated upstream
 <<<<<<< Updated upstream
 <<<<<<< Updated upstream
+<<<<<<< Updated upstream
 Version:        20210507
 =======
 Version:        20210508
@@ -30,6 +31,9 @@ Version:        20210508
 =======
 Version:        20210508
 >>>>>>> Stashed changes
+=======
+Version:        20210510
+>>>>>>> Stashed changes
 Release:        0
 Summary:        openSUSE MicroOS 
 License:        GPL-2.0-or-later
@@ -191,6 +195,7 @@ Provides:       product() = MicroOS
 <<<<<<< Updated upstream
 <<<<<<< Updated upstream
 <<<<<<< Updated upstream
+<<<<<<< Updated upstream
 Provides:       product(MicroOS) = 20210507-0
 Provides:       product-label() = openSUSE%20MicroOS
 Provides:       product-cpeid() = cpe%3A%2Fo%3Aopensuse%3Amicroos%3A20210507
@@ -209,6 +214,11 @@ Provides:       product(MicroOS) = 20210508-0
 Provides:       product-label() = openSUSE%20MicroOS
 Provides:       product-cpeid() = cpe%3A%2Fo%3Aopensuse%3Amicroos%3A20210508
 >>>>>>> Stashed changes
+=======
+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)
@@ -227,6 +237,7 @@ Provides:       flavor(dvd)
 <<<<<<< Updated upstream
 <<<<<<< Updated upstream
 <<<<<<< Updated upstream
+<<<<<<< Updated upstream
 Provides:       product_flavor(MicroOS) = 20210507-0
 =======
 Provides:       product_flavor(MicroOS) = 20210508-0
@@ -237,6 +248,9 @@ Provides:       product_flavor(MicroOS) = 20210508-0
 =======
 Provides:       product_flavor(MicroOS) = 20210508-0
 >>>>>>> Stashed changes
+=======
+Provides:       product_flavor(MicroOS) = 20210510-0
+>>>>>>> Stashed changes
 Summary:        openSUSE MicroOS%{?betaversion: %{betaversion}}
 
 %description dvd
@@ -255,6 +269,7 @@ Provides:       flavor(kubic-dvd)
 <<<<<<< Updated upstream
 <<<<<<< Updated upstream
 <<<<<<< Updated upstream
+<<<<<<< Updated upstream
 Provides:       product_flavor(MicroOS) = 20210507-0
 =======
 Provides:       product_flavor(MicroOS) = 20210508-0
@@ -265,6 +280,9 @@ Provides:       product_flavor(MicroOS) = 20210508-0
 =======
 Provides:       product_flavor(MicroOS) = 20210508-0
 >>>>>>> Stashed changes
+=======
+Provides:       product_flavor(MicroOS) = 20210510-0
+>>>>>>> Stashed changes
 Summary:        openSUSE MicroOS%{?betaversion: %{betaversion}}
 
 %description kubic-dvd
@@ -283,6 +301,7 @@ Provides:       flavor(appliance)
 <<<<<<< Updated upstream
 <<<<<<< Updated upstream
 <<<<<<< Updated upstream
+<<<<<<< Updated upstream
 Provides:       product_flavor(MicroOS) = 20210507-0
 =======
 Provides:       product_flavor(MicroOS) = 20210508-0
@@ -293,6 +312,9 @@ Provides:       product_flavor(MicroOS) = 20210508-0
 =======
 Provides:       product_flavor(MicroOS) = 20210508-0
 >>>>>>> Stashed changes
+=======
+Provides:       product_flavor(MicroOS) = 20210510-0
+>>>>>>> Stashed changes
 Summary:        openSUSE MicroOS%{?betaversion: %{betaversion}}
 
 %description appliance
@@ -311,6 +333,7 @@ Provides:       flavor(appliance-kubic)
 <<<<<<< Updated upstream
 <<<<<<< Updated upstream
 <<<<<<< Updated upstream
+<<<<<<< Updated upstream
 Provides:       product_flavor(MicroOS) = 20210507-0
 =======
 Provides:       product_flavor(MicroOS) = 20210508-0
@@ -321,6 +344,9 @@ Provides:       product_flavor(MicroOS) = 20210508-0
 =======
 Provides:       product_flavor(MicroOS) = 20210508-0
 >>>>>>> Stashed changes
+=======
+Provides:       product_flavor(MicroOS) = 20210510-0
+>>>>>>> Stashed changes
 Summary:        openSUSE MicroOS%{?betaversion: %{betaversion}}
 
 %description appliance-kubic
@@ -382,6 +408,7 @@ cat >$RPM_BUILD_ROOT/etc/products.d/MicroOS.prod << EOF
 <<<<<<< Updated upstream
 <<<<<<< Updated upstream
 <<<<<<< Updated upstream
+<<<<<<< Updated upstream
   <version>20210507</version>
   <release>0</release>
   <endoflife></endoflife>
@@ -404,6 +431,13 @@ cat >$RPM_BUILD_ROOT/etc/products.d/MicroOS.prod << EOF
 >>>>>>> Stashed changes
 =======
 >>>>>>> Stashed changes
+=======
+  <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 1a38f8c..a34453e 100644
--- a/openSUSE-Addon-NonOss-release.spec
+++ b/openSUSE-Addon-NonOss-release.spec
@@ -2,6 +2,7 @@
 <<<<<<< Updated upstream
 <<<<<<< Updated upstream
 <<<<<<< Updated upstream
+<<<<<<< Updated upstream
 # spec file for package openSUSE-Addon-NonOss-release (Version 20210507)
 =======
 # spec file for package openSUSE-Addon-NonOss-release (Version 20210508)
@@ -12,6 +13,9 @@
 =======
 # spec file for package openSUSE-Addon-NonOss-release (Version 20210508)
 >>>>>>> Stashed changes
+=======
+# spec file for package openSUSE-Addon-NonOss-release (Version 20210510)
+>>>>>>> Stashed changes
 #
 # Copyright (c) 2021 openSUSE.
 #
@@ -31,6 +35,7 @@ Summary:        openSUSE NonOSS Addon%{?betaversion: %{betaversion}}
 <<<<<<< Updated upstream
 <<<<<<< Updated upstream
 <<<<<<< Updated upstream
+<<<<<<< Updated upstream
 Version:        20210507
 =======
 Version:        20210508
@@ -41,6 +46,9 @@ Version:        20210508
 =======
 Version:        20210508
 >>>>>>> Stashed changes
+=======
+Version:        20210510
+>>>>>>> Stashed changes
 Release:        0
 License:        BSD-3-Clause
 Group:          System/Fhs
@@ -50,6 +58,7 @@ Provides:       product() = openSUSE-Addon-NonOss
 <<<<<<< Updated upstream
 <<<<<<< Updated upstream
 <<<<<<< Updated upstream
+<<<<<<< Updated upstream
 Provides:       product(openSUSE-Addon-NonOss) = 20210507-0
 Provides:       product-label() = non%20oss%20addon
 Provides:       product-cpeid() = cpe%3A%2Fo%3Aopensuse%3Aopensuse%2Daddon%2Dnonoss%3A20210507
@@ -68,6 +77,11 @@ Provides:       product(openSUSE-Addon-NonOss) = 20210508-0
 Provides:       product-label() = non%20oss%20addon
 Provides:       product-cpeid() = cpe%3A%2Fo%3Aopensuse%3Aopensuse%2Daddon%2Dnonoss%3A20210508
 >>>>>>> Stashed changes
+=======
+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
@@ -94,6 +108,7 @@ cat >$RPM_BUILD_ROOT/etc/products.d/openSUSE-Addon-NonOss.prod << EOF
 <<<<<<< Updated upstream
 <<<<<<< Updated upstream
 <<<<<<< Updated upstream
+<<<<<<< Updated upstream
   <version>20210507</version>
   <release>0</release>
   <arch>%{_target_cpu}</arch>
@@ -114,6 +129,12 @@ cat >$RPM_BUILD_ROOT/etc/products.d/openSUSE-Addon-NonOss.prod << EOF
 >>>>>>> Stashed changes
 =======
 >>>>>>> Stashed changes
+=======
+  <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 d9826fb..3cd165f 100644
--- a/openSUSE-release.spec
+++ b/openSUSE-release.spec
@@ -23,6 +23,7 @@ Name:           openSUSE-release
 <<<<<<< Updated upstream
 <<<<<<< Updated upstream
 <<<<<<< Updated upstream
+<<<<<<< Updated upstream
 Version:        20210507
 =======
 Version:        20210508
@@ -33,6 +34,9 @@ Version:        20210508
 =======
 Version:        20210508
 >>>>>>> Stashed changes
+=======
+Version:        20210510
+>>>>>>> Stashed changes
 Release:        0
 # 0 is the product release, not the build release of this package
 Summary:        openSUSE Tumbleweed
@@ -193,6 +197,7 @@ Provides:       product() = openSUSE
 <<<<<<< Updated upstream
 <<<<<<< Updated upstream
 <<<<<<< Updated upstream
+<<<<<<< Updated upstream
 Provides:       product(openSUSE) = 20210507-0
 =======
 Provides:       product(openSUSE) = 20210508-0
@@ -203,6 +208,9 @@ Provides:       product(openSUSE) = 20210508-0
 =======
 Provides:       product(openSUSE) = 20210508-0
 >>>>>>> Stashed changes
+=======
+Provides:       product(openSUSE) = 20210510-0
+>>>>>>> Stashed changes
 %ifarch x86_64
 Provides:       product-register-target() = openSUSE%2DTumbleweed%2Dx86_64
 %endif
@@ -219,6 +227,7 @@ Provides:       product-label() = openSUSE
 <<<<<<< Updated upstream
 <<<<<<< Updated upstream
 <<<<<<< Updated upstream
+<<<<<<< Updated upstream
 Provides:       product-cpeid() = cpe%3A%2Fo%3Aopensuse%3Aopensuse%3A20210507
 =======
 Provides:       product-cpeid() = cpe%3A%2Fo%3Aopensuse%3Aopensuse%3A20210508
@@ -229,6 +238,9 @@ Provides:       product-cpeid() = cpe%3A%2Fo%3Aopensuse%3Aopensuse%3A20210508
 =======
 Provides:       product-cpeid() = cpe%3A%2Fo%3Aopensuse%3Aopensuse%3A20210508
 >>>>>>> Stashed changes
+=======
+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)
@@ -245,6 +257,7 @@ Provides:       flavor(ftp)
 <<<<<<< Updated upstream
 <<<<<<< Updated upstream
 <<<<<<< Updated upstream
+<<<<<<< Updated upstream
 Provides:       product_flavor(openSUSE) = 20210507-0
 =======
 Provides:       product_flavor(openSUSE) = 20210508-0
@@ -255,6 +268,9 @@ Provides:       product_flavor(openSUSE) = 20210508-0
 =======
 Provides:       product_flavor(openSUSE) = 20210508-0
 >>>>>>> Stashed changes
+=======
+Provides:       product_flavor(openSUSE) = 20210510-0
+>>>>>>> Stashed changes
 Summary:        openSUSE Tumbleweed%{?betaversion: %{betaversion}}
 
 %description ftp
@@ -272,6 +288,7 @@ Provides:       flavor(mini)
 <<<<<<< Updated upstream
 <<<<<<< Updated upstream
 <<<<<<< Updated upstream
+<<<<<<< Updated upstream
 Provides:       product_flavor(openSUSE) = 20210507-0
 =======
 Provides:       product_flavor(openSUSE) = 20210508-0
@@ -282,6 +299,9 @@ Provides:       product_flavor(openSUSE) = 20210508-0
 =======
 Provides:       product_flavor(openSUSE) = 20210508-0
 >>>>>>> Stashed changes
+=======
+Provides:       product_flavor(openSUSE) = 20210510-0
+>>>>>>> Stashed changes
 Summary:        openSUSE Tumbleweed%{?betaversion: %{betaversion}}
 
 %description mini
@@ -299,6 +319,7 @@ Provides:       flavor(dvd)
 <<<<<<< Updated upstream
 <<<<<<< Updated upstream
 <<<<<<< Updated upstream
+<<<<<<< Updated upstream
 Provides:       product_flavor(openSUSE) = 20210507-0
 =======
 Provides:       product_flavor(openSUSE) = 20210508-0
@@ -309,6 +330,9 @@ Provides:       product_flavor(openSUSE) = 20210508-0
 =======
 Provides:       product_flavor(openSUSE) = 20210508-0
 >>>>>>> Stashed changes
+=======
+Provides:       product_flavor(openSUSE) = 20210510-0
+>>>>>>> Stashed changes
 Summary:        openSUSE Tumbleweed%{?betaversion: %{betaversion}}
 
 %description dvd
@@ -326,6 +350,7 @@ Provides:       flavor(livecd-kde)
 <<<<<<< Updated upstream
 <<<<<<< Updated upstream
 <<<<<<< Updated upstream
+<<<<<<< Updated upstream
 Provides:       product_flavor(openSUSE) = 20210507-0
 =======
 Provides:       product_flavor(openSUSE) = 20210508-0
@@ -336,6 +361,9 @@ Provides:       product_flavor(openSUSE) = 20210508-0
 =======
 Provides:       product_flavor(openSUSE) = 20210508-0
 >>>>>>> Stashed changes
+=======
+Provides:       product_flavor(openSUSE) = 20210510-0
+>>>>>>> Stashed changes
 Summary:        openSUSE Tumbleweed%{?betaversion: %{betaversion}}
 
 %description livecd-kde
@@ -353,6 +381,7 @@ Provides:       flavor(livecd-x11)
 <<<<<<< Updated upstream
 <<<<<<< Updated upstream
 <<<<<<< Updated upstream
+<<<<<<< Updated upstream
 Provides:       product_flavor(openSUSE) = 20210507-0
 =======
 Provides:       product_flavor(openSUSE) = 20210508-0
@@ -363,6 +392,9 @@ Provides:       product_flavor(openSUSE) = 20210508-0
 =======
 Provides:       product_flavor(openSUSE) = 20210508-0
 >>>>>>> Stashed changes
+=======
+Provides:       product_flavor(openSUSE) = 20210510-0
+>>>>>>> Stashed changes
 Summary:        openSUSE Tumbleweed%{?betaversion: %{betaversion}}
 
 %description livecd-x11
@@ -380,6 +412,7 @@ Provides:       flavor(livecd-gnome)
 <<<<<<< Updated upstream
 <<<<<<< Updated upstream
 <<<<<<< Updated upstream
+<<<<<<< Updated upstream
 Provides:       product_flavor(openSUSE) = 20210507-0
 =======
 Provides:       product_flavor(openSUSE) = 20210508-0
@@ -390,6 +423,9 @@ Provides:       product_flavor(openSUSE) = 20210508-0
 =======
 Provides:       product_flavor(openSUSE) = 20210508-0
 >>>>>>> Stashed changes
+=======
+Provides:       product_flavor(openSUSE) = 20210510-0
+>>>>>>> Stashed changes
 Summary:        openSUSE Tumbleweed%{?betaversion: %{betaversion}}
 
 %description livecd-gnome
@@ -407,6 +443,7 @@ Provides:       flavor(livecd-xfce)
 <<<<<<< Updated upstream
 <<<<<<< Updated upstream
 <<<<<<< Updated upstream
+<<<<<<< Updated upstream
 Provides:       product_flavor(openSUSE) = 20210507-0
 =======
 Provides:       product_flavor(openSUSE) = 20210508-0
@@ -417,6 +454,9 @@ Provides:       product_flavor(openSUSE) = 20210508-0
 =======
 Provides:       product_flavor(openSUSE) = 20210508-0
 >>>>>>> Stashed changes
+=======
+Provides:       product_flavor(openSUSE) = 20210510-0
+>>>>>>> Stashed changes
 Summary:        openSUSE Tumbleweed%{?betaversion: %{betaversion}}
 
 %description livecd-xfce
@@ -434,6 +474,7 @@ Provides:       flavor(usb-kde)
 <<<<<<< Updated upstream
 <<<<<<< Updated upstream
 <<<<<<< Updated upstream
+<<<<<<< Updated upstream
 Provides:       product_flavor(openSUSE) = 20210507-0
 =======
 Provides:       product_flavor(openSUSE) = 20210508-0
@@ -444,6 +485,9 @@ Provides:       product_flavor(openSUSE) = 20210508-0
 =======
 Provides:       product_flavor(openSUSE) = 20210508-0
 >>>>>>> Stashed changes
+=======
+Provides:       product_flavor(openSUSE) = 20210510-0
+>>>>>>> Stashed changes
 Summary:        openSUSE Tumbleweed%{?betaversion: %{betaversion}}
 
 %description usb-kde
@@ -461,6 +505,7 @@ Provides:       flavor(usb-gnome)
 <<<<<<< Updated upstream
 <<<<<<< Updated upstream
 <<<<<<< Updated upstream
+<<<<<<< Updated upstream
 Provides:       product_flavor(openSUSE) = 20210507-0
 =======
 Provides:       product_flavor(openSUSE) = 20210508-0
@@ -471,6 +516,9 @@ Provides:       product_flavor(openSUSE) = 20210508-0
 =======
 Provides:       product_flavor(openSUSE) = 20210508-0
 >>>>>>> Stashed changes
+=======
+Provides:       product_flavor(openSUSE) = 20210510-0
+>>>>>>> Stashed changes
 Summary:        openSUSE Tumbleweed%{?betaversion: %{betaversion}}
 
 %description usb-gnome
@@ -488,6 +536,7 @@ Provides:       flavor(usb-x11)
 <<<<<<< Updated upstream
 <<<<<<< Updated upstream
 <<<<<<< Updated upstream
+<<<<<<< Updated upstream
 Provides:       product_flavor(openSUSE) = 20210507-0
 =======
 Provides:       product_flavor(openSUSE) = 20210508-0
@@ -498,6 +547,9 @@ Provides:       product_flavor(openSUSE) = 20210508-0
 =======
 Provides:       product_flavor(openSUSE) = 20210508-0
 >>>>>>> Stashed changes
+=======
+Provides:       product_flavor(openSUSE) = 20210510-0
+>>>>>>> Stashed changes
 Summary:        openSUSE Tumbleweed%{?betaversion: %{betaversion}}
 
 %description usb-x11
@@ -515,6 +567,7 @@ Provides:       flavor(appliance)
 <<<<<<< Updated upstream
 <<<<<<< Updated upstream
 <<<<<<< Updated upstream
+<<<<<<< Updated upstream
 Provides:       product_flavor(openSUSE) = 20210507-0
 =======
 Provides:       product_flavor(openSUSE) = 20210508-0
@@ -525,6 +578,9 @@ Provides:       product_flavor(openSUSE) = 20210508-0
 =======
 Provides:       product_flavor(openSUSE) = 20210508-0
 >>>>>>> Stashed changes
+=======
+Provides:       product_flavor(openSUSE) = 20210510-0
+>>>>>>> Stashed changes
 Summary:        openSUSE Tumbleweed%{?betaversion: %{betaversion}}
 
 %description appliance
@@ -542,6 +598,7 @@ Provides:       flavor(appliance-docker)
 <<<<<<< Updated upstream
 <<<<<<< Updated upstream
 <<<<<<< Updated upstream
+<<<<<<< Updated upstream
 Provides:       product_flavor(openSUSE) = 20210507-0
 =======
 Provides:       product_flavor(openSUSE) = 20210508-0
@@ -552,6 +609,9 @@ Provides:       product_flavor(openSUSE) = 20210508-0
 =======
 Provides:       product_flavor(openSUSE) = 20210508-0
 >>>>>>> Stashed changes
+=======
+Provides:       product_flavor(openSUSE) = 20210510-0
+>>>>>>> Stashed changes
 Summary:        openSUSE Tumbleweed%{?betaversion: %{betaversion}}
 
 %description appliance-docker
@@ -569,6 +629,7 @@ Provides:       flavor(appliance-kvm)
 <<<<<<< Updated upstream
 <<<<<<< Updated upstream
 <<<<<<< Updated upstream
+<<<<<<< Updated upstream
 Provides:       product_flavor(openSUSE) = 20210507-0
 =======
 Provides:       product_flavor(openSUSE) = 20210508-0
@@ -579,6 +640,9 @@ Provides:       product_flavor(openSUSE) = 20210508-0
 =======
 Provides:       product_flavor(openSUSE) = 20210508-0
 >>>>>>> Stashed changes
+=======
+Provides:       product_flavor(openSUSE) = 20210510-0
+>>>>>>> Stashed changes
 Summary:        openSUSE Tumbleweed%{?betaversion: %{betaversion}}
 
 %description appliance-kvm
@@ -596,6 +660,7 @@ Provides:       flavor(appliance-vmware)
 <<<<<<< Updated upstream
 <<<<<<< Updated upstream
 <<<<<<< Updated upstream
+<<<<<<< Updated upstream
 Provides:       product_flavor(openSUSE) = 20210507-0
 =======
 Provides:       product_flavor(openSUSE) = 20210508-0
@@ -606,6 +671,9 @@ Provides:       product_flavor(openSUSE) = 20210508-0
 =======
 Provides:       product_flavor(openSUSE) = 20210508-0
 >>>>>>> Stashed changes
+=======
+Provides:       product_flavor(openSUSE) = 20210510-0
+>>>>>>> Stashed changes
 Summary:        openSUSE Tumbleweed%{?betaversion: %{betaversion}}
 
 %description appliance-vmware
@@ -623,6 +691,7 @@ Provides:       flavor(appliance-openstack)
 <<<<<<< Updated upstream
 <<<<<<< Updated upstream
 <<<<<<< Updated upstream
+<<<<<<< Updated upstream
 Provides:       product_flavor(openSUSE) = 20210507-0
 =======
 Provides:       product_flavor(openSUSE) = 20210508-0
@@ -633,6 +702,9 @@ Provides:       product_flavor(openSUSE) = 20210508-0
 =======
 Provides:       product_flavor(openSUSE) = 20210508-0
 >>>>>>> Stashed changes
+=======
+Provides:       product_flavor(openSUSE) = 20210510-0
+>>>>>>> Stashed changes
 Summary:        openSUSE Tumbleweed%{?betaversion: %{betaversion}}
 
 %description appliance-openstack
@@ -650,6 +722,7 @@ Provides:       flavor(appliance-hyperv)
 <<<<<<< Updated upstream
 <<<<<<< Updated upstream
 <<<<<<< Updated upstream
+<<<<<<< Updated upstream
 Provides:       product_flavor(openSUSE) = 20210507-0
 =======
 Provides:       product_flavor(openSUSE) = 20210508-0
@@ -660,6 +733,9 @@ Provides:       product_flavor(openSUSE) = 20210508-0
 =======
 Provides:       product_flavor(openSUSE) = 20210508-0
 >>>>>>> Stashed changes
+=======
+Provides:       product_flavor(openSUSE) = 20210510-0
+>>>>>>> Stashed changes
 Summary:        openSUSE Tumbleweed%{?betaversion: %{betaversion}}
 
 %description appliance-hyperv
@@ -677,6 +753,7 @@ Provides:       flavor(appliance-vagrant)
 <<<<<<< Updated upstream
 <<<<<<< Updated upstream
 <<<<<<< Updated upstream
+<<<<<<< Updated upstream
 Provides:       product_flavor(openSUSE) = 20210507-0
 =======
 Provides:       product_flavor(openSUSE) = 20210508-0
@@ -687,6 +764,9 @@ Provides:       product_flavor(openSUSE) = 20210508-0
 =======
 Provides:       product_flavor(openSUSE) = 20210508-0
 >>>>>>> Stashed changes
+=======
+Provides:       product_flavor(openSUSE) = 20210510-0
+>>>>>>> Stashed changes
 Summary:        openSUSE Tumbleweed%{?betaversion: %{betaversion}}
 
 %description appliance-vagrant
@@ -704,6 +784,7 @@ Provides:       flavor(appliance-wsl)
 <<<<<<< Updated upstream
 <<<<<<< Updated upstream
 <<<<<<< Updated upstream
+<<<<<<< Updated upstream
 Provides:       product_flavor(openSUSE) = 20210507-0
 =======
 Provides:       product_flavor(openSUSE) = 20210508-0
@@ -714,6 +795,9 @@ Provides:       product_flavor(openSUSE) = 20210508-0
 =======
 Provides:       product_flavor(openSUSE) = 20210508-0
 >>>>>>> Stashed changes
+=======
+Provides:       product_flavor(openSUSE) = 20210510-0
+>>>>>>> Stashed changes
 Summary:        openSUSE Tumbleweed%{?betaversion: %{betaversion}}
 
 %description appliance-wsl
@@ -731,6 +815,7 @@ Provides:       flavor(appliance-custom)
 <<<<<<< Updated upstream
 <<<<<<< Updated upstream
 <<<<<<< Updated upstream
+<<<<<<< Updated upstream
 Provides:       product_flavor(openSUSE) = 20210507-0
 =======
 Provides:       product_flavor(openSUSE) = 20210508-0
@@ -741,6 +826,9 @@ Provides:       product_flavor(openSUSE) = 20210508-0
 =======
 Provides:       product_flavor(openSUSE) = 20210508-0
 >>>>>>> Stashed changes
+=======
+Provides:       product_flavor(openSUSE) = 20210510-0
+>>>>>>> Stashed changes
 Summary:        openSUSE Tumbleweed%{?betaversion: %{betaversion}}
 
 %description appliance-custom
@@ -818,6 +906,7 @@ cat >$RPM_BUILD_ROOT/etc/products.d/openSUSE.prod << EOF
 <<<<<<< Updated upstream
 <<<<<<< Updated upstream
 <<<<<<< Updated upstream
+<<<<<<< Updated upstream
   <version>20210507</version>
   <release>0</release>
   <arch>%{_target_cpu}</arch>
@@ -840,6 +929,12 @@ cat >$RPM_BUILD_ROOT/etc/products.d/openSUSE.prod << EOF
   <arch>%{_target_cpu}</arch>
   <cpeid>cpe:/o:opensuse:opensuse:20210508</cpeid>
 >>>>>>> Stashed changes
+=======
+  <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 7c747f7..91b44a0 100644
--- a/weakremovers.inc
+++ b/weakremovers.inc
@@ -4120,6 +4120,7 @@ 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)
@@ -4159,7 +4160,6 @@ Provides: weakremover(crossc-devel)
 Provides: weakremover(cryptconfig)
 Provides: weakremover(cryptol)
 Provides: weakremover(csound-java-bindings)
-Provides: weakremover(ctags)
 Provides: weakremover(cura1-lulzbot)
 Provides: weakremover(curl-mini)
 Provides: weakremover(cvs2svn)
@@ -10187,6 +10187,7 @@ Provides: weakremover(libcholmod-3_0_11)
 Provides: weakremover(libcilkrts5-gcc6)
 Provides: weakremover(libcint3)
 Provides: weakremover(libcivetweb1_11_0)
+Provides: weakremover(libcivetweb1_13_0)
 Provides: weakremover(libclamav7)
 Provides: weakremover(libclammspack0)
 Provides: weakremover(libclang3_8)
@@ -12875,6 +12876,8 @@ Provides: weakremover(lrcShow-X)
 Provides: weakremover(lrcShow-X-lang)
 Provides: weakremover(lrzip)
 Provides: weakremover(lswm)
+Provides: weakremover(lttng-modules)
+Provides: weakremover(lttng-modules-kmp-default)
 Provides: weakremover(ltxml)
 Provides: weakremover(ltxml-devel)
 Provides: weakremover(lua-devel)
@@ -18375,6 +18378,7 @@ Provides: weakremover(python36-yafe)
 Provides: weakremover(python36-yt)
 Provides: weakremover(python36-zarr)
 Provides: weakremover(python36-zignal)
+Provides: weakremover(python38-HyperKitty)
 Provides: weakremover(python38-PyGetWindow)
 Provides: weakremover(python38-ara)
 Provides: weakremover(python38-bcolz)
@@ -27688,6 +27692,7 @@ Provides: weakremover(libsvrcore0)
 Provides: weakremover(libyami-utils)
 Provides: weakremover(liquidhaskell)
 Provides: weakremover(lmms-devel)
+Provides: weakremover(lttng-modules-kmp-pae)
 Provides: weakremover(mozldap-devel)
 Provides: weakremover(mozldap-libs)
 Provides: weakremover(mozldap-tools)
@@ -27759,6 +27764,8 @@ 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)