diff --git a/.files b/.files
index 1eee4a8..028f088 100644
Binary files a/.files and b/.files differ
diff --git a/.rev b/.rev
index f2171bc..ae22f83 100644
--- a/.rev
+++ b/.rev
@@ -6811,20 +6811,6 @@
     <user>staging-bot</user>
     <comment>Automatic update</comment>
   </revision>
-<<<<<<< Updated upstream
-<<<<<<< Updated upstream
-<<<<<<< Updated upstream
-<<<<<<< Updated upstream
-<<<<<<< Updated upstream
-=======
-=======
->>>>>>> Stashed changes
-=======
->>>>>>> Stashed changes
-=======
->>>>>>> Stashed changes
-=======
->>>>>>> Stashed changes
   <revision rev="974" vrev="974">
     <srcmd5>205643fd1c037f6e2941fea90b1b5383</srcmd5>
     <version>unknown</version>
@@ -6832,18 +6818,6 @@
     <user>staging-bot</user>
     <comment>Automatic update</comment>
   </revision>
-<<<<<<< Updated upstream
-<<<<<<< Updated upstream
-<<<<<<< Updated upstream
-<<<<<<< Updated upstream
->>>>>>> Stashed changes
-=======
-=======
->>>>>>> Stashed changes
-=======
->>>>>>> Stashed changes
-=======
->>>>>>> Stashed changes
   <revision rev="975" vrev="975">
     <srcmd5>7855cb2000221cbee5308ae47bdecac3</srcmd5>
     <version>unknown</version>
@@ -6851,15 +6825,6 @@
     <user>staging-bot</user>
     <comment>Automatic update</comment>
   </revision>
-<<<<<<< Updated upstream
-<<<<<<< Updated upstream
-<<<<<<< Updated upstream
->>>>>>> Stashed changes
-=======
-=======
->>>>>>> Stashed changes
-=======
->>>>>>> Stashed changes
   <revision rev="976" vrev="976">
     <srcmd5>2c8691a952e8275668bdb466a4fe5b15</srcmd5>
     <version>unknown</version>
@@ -6867,12 +6832,6 @@
     <user>staging-bot</user>
     <comment>Automatic update</comment>
   </revision>
-<<<<<<< Updated upstream
-<<<<<<< Updated upstream
->>>>>>> Stashed changes
-=======
-=======
->>>>>>> Stashed changes
   <revision rev="977" vrev="977">
     <srcmd5>f70553a8388e7166f04329e0891fbbd2</srcmd5>
     <version>unknown</version>
@@ -6880,9 +6839,6 @@
     <user>staging-bot</user>
     <comment>Automatic update</comment>
   </revision>
-<<<<<<< Updated upstream
->>>>>>> Stashed changes
-=======
   <revision rev="978" vrev="978">
     <srcmd5>f871c83fbed07ac354efc05f27d63e85</srcmd5>
     <version>unknown</version>
@@ -6890,5 +6846,11 @@
     <user>staging-bot</user>
     <comment>Automatic update</comment>
   </revision>
->>>>>>> Stashed changes
+  <revision rev="979" vrev="979">
+    <srcmd5>9207c81a2daca42dd4284fc5e24b0de5</srcmd5>
+    <version>unknown</version>
+    <time>1620782410</time>
+    <user>staging-bot</user>
+    <comment>Automatic update</comment>
+  </revision>
 </revisionlist>
diff --git a/.servicemark b/.servicemark
index dc60e89..46dfcca 100644
--- a/.servicemark
+++ b/.servicemark
@@ -1,21 +1 @@
-<<<<<<< Updated upstream
-<<<<<<< Updated upstream
-<<<<<<< Updated upstream
-<<<<<<< Updated upstream
-<<<<<<< Updated upstream
-8974c5e31f55a0c863cce2a213e80ea1
-=======
-cc4598d1611e7429d4cbcd1a6e0e73e7
->>>>>>> Stashed changes
-=======
-eb97875a5ed70118fda5b31fc2b1e450
->>>>>>> Stashed changes
-=======
-1f99ca6895bc64e1156a0829c74ed9c1
->>>>>>> Stashed changes
-=======
-8752bb8a5d119847b4e2fa22db417a25
->>>>>>> Stashed changes
-=======
-ef63c03f7bf1f6f446e8ce506f3994f8
->>>>>>> Stashed changes
+fad20483427e43ab7244f2e5147d66d3
diff --git a/MicroOS-release.spec b/MicroOS-release.spec
index 1eb0a1f..9add695 100644
--- a/MicroOS-release.spec
+++ b/MicroOS-release.spec
@@ -17,27 +17,7 @@
 
 
 Name:           MicroOS-release
-<<<<<<< Updated upstream
-<<<<<<< Updated upstream
-<<<<<<< Updated upstream
-<<<<<<< Updated upstream
-<<<<<<< Updated upstream
-Version:        20210507
-=======
-Version:        20210508
->>>>>>> Stashed changes
-=======
-Version:        20210508
->>>>>>> Stashed changes
-=======
-Version:        20210508
->>>>>>> Stashed changes
-=======
-Version:        20210510
->>>>>>> Stashed changes
-=======
-Version:        20210510
->>>>>>> Stashed changes
+Version:        20210511
 Release:        0
 Summary:        openSUSE MicroOS 
 License:        GPL-2.0-or-later
@@ -196,39 +176,9 @@ ExclusiveArch:  %ix86 x86_64 ppc64le s390x aarch64 %arm
 %include %{SOURCE100}
 Provides:       %name-%version
 Provides:       product() = MicroOS
-<<<<<<< Updated upstream
-<<<<<<< Updated upstream
-<<<<<<< Updated upstream
-<<<<<<< Updated upstream
-<<<<<<< Updated upstream
-Provides:       product(MicroOS) = 20210507-0
+Provides:       product(MicroOS) = 20210511-0
 Provides:       product-label() = openSUSE%20MicroOS
-Provides:       product-cpeid() = cpe%3A%2Fo%3Aopensuse%3Amicroos%3A20210507
-=======
-Provides:       product(MicroOS) = 20210508-0
-Provides:       product-label() = openSUSE%20MicroOS
-Provides:       product-cpeid() = cpe%3A%2Fo%3Aopensuse%3Amicroos%3A20210508
->>>>>>> Stashed changes
-=======
-Provides:       product(MicroOS) = 20210508-0
-Provides:       product-label() = openSUSE%20MicroOS
-Provides:       product-cpeid() = cpe%3A%2Fo%3Aopensuse%3Amicroos%3A20210508
->>>>>>> Stashed changes
-=======
-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(MicroOS) = 20210510-0
-Provides:       product-label() = openSUSE%20MicroOS
-Provides:       product-cpeid() = cpe%3A%2Fo%3Aopensuse%3Amicroos%3A20210510
->>>>>>> Stashed changes
+Provides:       product-cpeid() = cpe%3A%2Fo%3Aopensuse%3Amicroos%3A20210511
 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)
@@ -244,27 +194,7 @@ License:        BSD-3-Clause
 Group:          System/Fhs
 Provides:       product_flavor()
 Provides:       flavor(dvd)
-<<<<<<< Updated upstream
-<<<<<<< Updated upstream
-<<<<<<< Updated upstream
-<<<<<<< Updated upstream
-<<<<<<< Updated upstream
-Provides:       product_flavor(MicroOS) = 20210507-0
-=======
-Provides:       product_flavor(MicroOS) = 20210508-0
->>>>>>> Stashed changes
-=======
-Provides:       product_flavor(MicroOS) = 20210508-0
->>>>>>> Stashed changes
-=======
-Provides:       product_flavor(MicroOS) = 20210508-0
->>>>>>> Stashed changes
-=======
-Provides:       product_flavor(MicroOS) = 20210510-0
->>>>>>> Stashed changes
-=======
-Provides:       product_flavor(MicroOS) = 20210510-0
->>>>>>> Stashed changes
+Provides:       product_flavor(MicroOS) = 20210511-0
 Summary:        openSUSE MicroOS%{?betaversion: %{betaversion}}
 
 %description dvd
@@ -280,27 +210,7 @@ License:        BSD-3-Clause
 Group:          System/Fhs
 Provides:       product_flavor()
 Provides:       flavor(kubic-dvd)
-<<<<<<< Updated upstream
-<<<<<<< Updated upstream
-<<<<<<< Updated upstream
-<<<<<<< Updated upstream
-<<<<<<< Updated upstream
-Provides:       product_flavor(MicroOS) = 20210507-0
-=======
-Provides:       product_flavor(MicroOS) = 20210508-0
->>>>>>> Stashed changes
-=======
-Provides:       product_flavor(MicroOS) = 20210508-0
->>>>>>> Stashed changes
-=======
-Provides:       product_flavor(MicroOS) = 20210508-0
->>>>>>> Stashed changes
-=======
-Provides:       product_flavor(MicroOS) = 20210510-0
->>>>>>> Stashed changes
-=======
-Provides:       product_flavor(MicroOS) = 20210510-0
->>>>>>> Stashed changes
+Provides:       product_flavor(MicroOS) = 20210511-0
 Summary:        openSUSE MicroOS%{?betaversion: %{betaversion}}
 
 %description kubic-dvd
@@ -316,27 +226,7 @@ License:        BSD-3-Clause
 Group:          System/Fhs
 Provides:       product_flavor()
 Provides:       flavor(appliance)
-<<<<<<< Updated upstream
-<<<<<<< Updated upstream
-<<<<<<< Updated upstream
-<<<<<<< Updated upstream
-<<<<<<< Updated upstream
-Provides:       product_flavor(MicroOS) = 20210507-0
-=======
-Provides:       product_flavor(MicroOS) = 20210508-0
->>>>>>> Stashed changes
-=======
-Provides:       product_flavor(MicroOS) = 20210508-0
->>>>>>> Stashed changes
-=======
-Provides:       product_flavor(MicroOS) = 20210508-0
->>>>>>> Stashed changes
-=======
-Provides:       product_flavor(MicroOS) = 20210510-0
->>>>>>> Stashed changes
-=======
-Provides:       product_flavor(MicroOS) = 20210510-0
->>>>>>> Stashed changes
+Provides:       product_flavor(MicroOS) = 20210511-0
 Summary:        openSUSE MicroOS%{?betaversion: %{betaversion}}
 
 %description appliance
@@ -352,27 +242,7 @@ License:        BSD-3-Clause
 Group:          System/Fhs
 Provides:       product_flavor()
 Provides:       flavor(appliance-kubic)
-<<<<<<< Updated upstream
-<<<<<<< Updated upstream
-<<<<<<< Updated upstream
-<<<<<<< Updated upstream
-<<<<<<< Updated upstream
-Provides:       product_flavor(MicroOS) = 20210507-0
-=======
-Provides:       product_flavor(MicroOS) = 20210508-0
->>>>>>> Stashed changes
-=======
-Provides:       product_flavor(MicroOS) = 20210508-0
->>>>>>> Stashed changes
-=======
-Provides:       product_flavor(MicroOS) = 20210508-0
->>>>>>> Stashed changes
-=======
-Provides:       product_flavor(MicroOS) = 20210510-0
->>>>>>> Stashed changes
-=======
-Provides:       product_flavor(MicroOS) = 20210510-0
->>>>>>> Stashed changes
+Provides:       product_flavor(MicroOS) = 20210511-0
 Summary:        openSUSE MicroOS%{?betaversion: %{betaversion}}
 
 %description appliance-kubic
@@ -431,45 +301,11 @@ cat >$RPM_BUILD_ROOT/etc/products.d/MicroOS.prod << EOF
 <product schemeversion="0">
   <vendor>openSUSE</vendor>
   <name>MicroOS</name>
-<<<<<<< Updated upstream
-<<<<<<< Updated upstream
-<<<<<<< Updated upstream
-<<<<<<< Updated upstream
-<<<<<<< Updated upstream
-  <version>20210507</version>
-  <release>0</release>
-  <endoflife></endoflife>
-  <arch>%{_target_cpu}</arch>
-  <cpeid>cpe:/o:opensuse:microos:20210507</cpeid>
-=======
-=======
->>>>>>> Stashed changes
-=======
->>>>>>> Stashed changes
-  <version>20210508</version>
-  <release>0</release>
-  <endoflife></endoflife>
-  <arch>%{_target_cpu}</arch>
-  <cpeid>cpe:/o:opensuse:microos:20210508</cpeid>
-<<<<<<< Updated upstream
-<<<<<<< Updated upstream
->>>>>>> Stashed changes
-=======
->>>>>>> Stashed changes
-=======
->>>>>>> Stashed changes
-=======
-=======
->>>>>>> Stashed changes
-  <version>20210510</version>
+  <version>20210511</version>
   <release>0</release>
   <endoflife></endoflife>
   <arch>%{_target_cpu}</arch>
-  <cpeid>cpe:/o:opensuse:microos:20210510</cpeid>
-<<<<<<< Updated upstream
->>>>>>> Stashed changes
-=======
->>>>>>> Stashed changes
+  <cpeid>cpe:/o:opensuse:microos:20210511</cpeid>
   <productline>MicroOS</productline>
   <register>
     <pool>
diff --git a/openSUSE-Addon-NonOss-release.spec b/openSUSE-Addon-NonOss-release.spec
index c456eda..8c78122 100644
--- a/openSUSE-Addon-NonOss-release.spec
+++ b/openSUSE-Addon-NonOss-release.spec
@@ -1,25 +1,5 @@
 #
-<<<<<<< Updated upstream
-<<<<<<< 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)
->>>>>>> Stashed changes
-=======
-# spec file for package openSUSE-Addon-NonOss-release (Version 20210508)
->>>>>>> Stashed changes
-=======
-# spec file for package openSUSE-Addon-NonOss-release (Version 20210508)
->>>>>>> Stashed changes
-=======
-# spec file for package openSUSE-Addon-NonOss-release (Version 20210510)
->>>>>>> Stashed changes
-=======
-# spec file for package openSUSE-Addon-NonOss-release (Version 20210510)
->>>>>>> Stashed changes
+# spec file for package openSUSE-Addon-NonOss-release (Version 20210511)
 #
 # Copyright (c) 2021 openSUSE.
 #
@@ -36,66 +16,16 @@
 Name:           openSUSE-Addon-NonOss-release
 %define         product openSUSE-Addon-NonOss
 Summary:        openSUSE NonOSS Addon%{?betaversion: %{betaversion}}
-<<<<<<< Updated upstream
-<<<<<<< Updated upstream
-<<<<<<< Updated upstream
-<<<<<<< Updated upstream
-<<<<<<< Updated upstream
-Version:        20210507
-=======
-Version:        20210508
->>>>>>> Stashed changes
-=======
-Version:        20210508
->>>>>>> Stashed changes
-=======
-Version:        20210508
->>>>>>> Stashed changes
-=======
-Version:        20210510
->>>>>>> Stashed changes
-=======
-Version:        20210510
->>>>>>> Stashed changes
+Version:        20210511
 Release:        0
 License:        BSD-3-Clause
 Group:          System/Fhs
 
 Provides:       %name-%version
 Provides:       product() = openSUSE-Addon-NonOss
-<<<<<<< Updated upstream
-<<<<<<< Updated upstream
-<<<<<<< Updated upstream
-<<<<<<< Updated upstream
-<<<<<<< Updated upstream
-Provides:       product(openSUSE-Addon-NonOss) = 20210507-0
+Provides:       product(openSUSE-Addon-NonOss) = 20210511-0
 Provides:       product-label() = non%20oss%20addon
-Provides:       product-cpeid() = cpe%3A%2Fo%3Aopensuse%3Aopensuse%2Daddon%2Dnonoss%3A20210507
-=======
-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) = 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) = 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
-=======
-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
+Provides:       product-cpeid() = cpe%3A%2Fo%3Aopensuse%3Aopensuse%2Daddon%2Dnonoss%3A20210511
 
 
 AutoReqProv:    on
@@ -119,42 +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
-<<<<<<< Updated upstream
-<<<<<<< Updated upstream
-<<<<<<< Updated upstream
-<<<<<<< Updated upstream
-  <version>20210507</version>
-  <release>0</release>
-  <arch>%{_target_cpu}</arch>
-  <cpeid>cpe:/o:opensuse:opensuse-addon-nonoss:20210507</cpeid>
-=======
-=======
->>>>>>> Stashed changes
-=======
->>>>>>> Stashed changes
-  <version>20210508</version>
-  <release>0</release>
-  <arch>%{_target_cpu}</arch>
-  <cpeid>cpe:/o:opensuse:opensuse-addon-nonoss:20210508</cpeid>
-<<<<<<< Updated upstream
-<<<<<<< Updated upstream
->>>>>>> Stashed changes
-=======
->>>>>>> Stashed changes
-=======
->>>>>>> Stashed changes
-=======
-=======
->>>>>>> Stashed changes
-  <version>20210510</version>
+  <version>20210511</version>
   <release>0</release>
   <arch>%{_target_cpu}</arch>
-  <cpeid>cpe:/o:opensuse:opensuse-addon-nonoss:20210510</cpeid>
-<<<<<<< Updated upstream
->>>>>>> Stashed changes
-=======
->>>>>>> Stashed changes
+  <cpeid>cpe:/o:opensuse:opensuse-addon-nonoss:20210511</cpeid>
   <register>
     <pool>
     </pool>
diff --git a/openSUSE-release.spec b/openSUSE-release.spec
index dfa2dd6..b989f37 100644
--- a/openSUSE-release.spec
+++ b/openSUSE-release.spec
@@ -20,27 +20,7 @@
 #define betaversion %{nil}
 %define codename Tumbleweed
 Name:           openSUSE-release
-<<<<<<< Updated upstream
-<<<<<<< Updated upstream
-<<<<<<< Updated upstream
-<<<<<<< Updated upstream
-<<<<<<< Updated upstream
-Version:        20210507
-=======
-Version:        20210508
->>>>>>> Stashed changes
-=======
-Version:        20210508
->>>>>>> Stashed changes
-=======
-Version:        20210508
->>>>>>> Stashed changes
-=======
-Version:        20210510
->>>>>>> Stashed changes
-=======
-Version:        20210510
->>>>>>> Stashed changes
+Version:        20210511
 Release:        0
 # 0 is the product release, not the build release of this package
 Summary:        openSUSE Tumbleweed
@@ -198,27 +178,7 @@ Provides:       weakremover(openssl-debuginfo)
 %include %{SOURCE100}
 Provides:       %name-%version
 Provides:       product() = openSUSE
-<<<<<<< Updated upstream
-<<<<<<< Updated upstream
-<<<<<<< Updated upstream
-<<<<<<< Updated upstream
-<<<<<<< Updated upstream
-Provides:       product(openSUSE) = 20210507-0
-=======
-Provides:       product(openSUSE) = 20210508-0
->>>>>>> Stashed changes
-=======
-Provides:       product(openSUSE) = 20210508-0
->>>>>>> Stashed changes
-=======
-Provides:       product(openSUSE) = 20210508-0
->>>>>>> Stashed changes
-=======
-Provides:       product(openSUSE) = 20210510-0
->>>>>>> Stashed changes
-=======
-Provides:       product(openSUSE) = 20210510-0
->>>>>>> Stashed changes
+Provides:       product(openSUSE) = 20210511-0
 %ifarch x86_64
 Provides:       product-register-target() = openSUSE%2DTumbleweed%2Dx86_64
 %endif
@@ -232,27 +192,7 @@ Provides:       product-register-target() = openSUSE%2DTumbleweed%2Dppc64le
 Provides:       product-register-target() = openSUSE%2DTumbleweed%2Daarch64
 %endif
 Provides:       product-label() = openSUSE
-<<<<<<< Updated upstream
-<<<<<<< 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
->>>>>>> Stashed changes
-=======
-Provides:       product-cpeid() = cpe%3A%2Fo%3Aopensuse%3Aopensuse%3A20210508
->>>>>>> Stashed changes
-=======
-Provides:       product-cpeid() = cpe%3A%2Fo%3Aopensuse%3Aopensuse%3A20210508
->>>>>>> Stashed changes
-=======
-Provides:       product-cpeid() = cpe%3A%2Fo%3Aopensuse%3Aopensuse%3A20210510
->>>>>>> Stashed changes
-=======
-Provides:       product-cpeid() = cpe%3A%2Fo%3Aopensuse%3Aopensuse%3A20210510
->>>>>>> Stashed changes
+Provides:       product-cpeid() = cpe%3A%2Fo%3Aopensuse%3Aopensuse%3A20210511
 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)
@@ -266,27 +206,7 @@ License:        BSD-3-Clause
 Group:          System/Fhs
 Provides:       product_flavor()
 Provides:       flavor(ftp)
-<<<<<<< Updated upstream
-<<<<<<< Updated upstream
-<<<<<<< Updated upstream
-<<<<<<< Updated upstream
-<<<<<<< Updated upstream
-Provides:       product_flavor(openSUSE) = 20210507-0
-=======
-Provides:       product_flavor(openSUSE) = 20210508-0
->>>>>>> Stashed changes
-=======
-Provides:       product_flavor(openSUSE) = 20210508-0
->>>>>>> Stashed changes
-=======
-Provides:       product_flavor(openSUSE) = 20210508-0
->>>>>>> Stashed changes
-=======
-Provides:       product_flavor(openSUSE) = 20210510-0
->>>>>>> Stashed changes
-=======
-Provides:       product_flavor(openSUSE) = 20210510-0
->>>>>>> Stashed changes
+Provides:       product_flavor(openSUSE) = 20210511-0
 Summary:        openSUSE Tumbleweed%{?betaversion: %{betaversion}}
 
 %description ftp
@@ -301,27 +221,7 @@ License:        BSD-3-Clause
 Group:          System/Fhs
 Provides:       product_flavor()
 Provides:       flavor(mini)
-<<<<<<< Updated upstream
-<<<<<<< Updated upstream
-<<<<<<< Updated upstream
-<<<<<<< Updated upstream
-<<<<<<< Updated upstream
-Provides:       product_flavor(openSUSE) = 20210507-0
-=======
-Provides:       product_flavor(openSUSE) = 20210508-0
->>>>>>> Stashed changes
-=======
-Provides:       product_flavor(openSUSE) = 20210508-0
->>>>>>> Stashed changes
-=======
-Provides:       product_flavor(openSUSE) = 20210508-0
->>>>>>> Stashed changes
-=======
-Provides:       product_flavor(openSUSE) = 20210510-0
->>>>>>> Stashed changes
-=======
-Provides:       product_flavor(openSUSE) = 20210510-0
->>>>>>> Stashed changes
+Provides:       product_flavor(openSUSE) = 20210511-0
 Summary:        openSUSE Tumbleweed%{?betaversion: %{betaversion}}
 
 %description mini
@@ -336,27 +236,7 @@ License:        BSD-3-Clause
 Group:          System/Fhs
 Provides:       product_flavor()
 Provides:       flavor(dvd)
-<<<<<<< Updated upstream
-<<<<<<< Updated upstream
-<<<<<<< Updated upstream
-<<<<<<< Updated upstream
-<<<<<<< Updated upstream
-Provides:       product_flavor(openSUSE) = 20210507-0
-=======
-Provides:       product_flavor(openSUSE) = 20210508-0
->>>>>>> Stashed changes
-=======
-Provides:       product_flavor(openSUSE) = 20210508-0
->>>>>>> Stashed changes
-=======
-Provides:       product_flavor(openSUSE) = 20210508-0
->>>>>>> Stashed changes
-=======
-Provides:       product_flavor(openSUSE) = 20210510-0
->>>>>>> Stashed changes
-=======
-Provides:       product_flavor(openSUSE) = 20210510-0
->>>>>>> Stashed changes
+Provides:       product_flavor(openSUSE) = 20210511-0
 Summary:        openSUSE Tumbleweed%{?betaversion: %{betaversion}}
 
 %description dvd
@@ -371,27 +251,7 @@ License:        BSD-3-Clause
 Group:          System/Fhs
 Provides:       product_flavor()
 Provides:       flavor(livecd-kde)
-<<<<<<< Updated upstream
-<<<<<<< Updated upstream
-<<<<<<< Updated upstream
-<<<<<<< Updated upstream
-<<<<<<< Updated upstream
-Provides:       product_flavor(openSUSE) = 20210507-0
-=======
-Provides:       product_flavor(openSUSE) = 20210508-0
->>>>>>> Stashed changes
-=======
-Provides:       product_flavor(openSUSE) = 20210508-0
->>>>>>> Stashed changes
-=======
-Provides:       product_flavor(openSUSE) = 20210508-0
->>>>>>> Stashed changes
-=======
-Provides:       product_flavor(openSUSE) = 20210510-0
->>>>>>> Stashed changes
-=======
-Provides:       product_flavor(openSUSE) = 20210510-0
->>>>>>> Stashed changes
+Provides:       product_flavor(openSUSE) = 20210511-0
 Summary:        openSUSE Tumbleweed%{?betaversion: %{betaversion}}
 
 %description livecd-kde
@@ -406,27 +266,7 @@ License:        BSD-3-Clause
 Group:          System/Fhs
 Provides:       product_flavor()
 Provides:       flavor(livecd-x11)
-<<<<<<< Updated upstream
-<<<<<<< Updated upstream
-<<<<<<< Updated upstream
-<<<<<<< Updated upstream
-<<<<<<< Updated upstream
-Provides:       product_flavor(openSUSE) = 20210507-0
-=======
-Provides:       product_flavor(openSUSE) = 20210508-0
->>>>>>> Stashed changes
-=======
-Provides:       product_flavor(openSUSE) = 20210508-0
->>>>>>> Stashed changes
-=======
-Provides:       product_flavor(openSUSE) = 20210508-0
->>>>>>> Stashed changes
-=======
-Provides:       product_flavor(openSUSE) = 20210510-0
->>>>>>> Stashed changes
-=======
-Provides:       product_flavor(openSUSE) = 20210510-0
->>>>>>> Stashed changes
+Provides:       product_flavor(openSUSE) = 20210511-0
 Summary:        openSUSE Tumbleweed%{?betaversion: %{betaversion}}
 
 %description livecd-x11
@@ -441,27 +281,7 @@ License:        BSD-3-Clause
 Group:          System/Fhs
 Provides:       product_flavor()
 Provides:       flavor(livecd-gnome)
-<<<<<<< Updated upstream
-<<<<<<< Updated upstream
-<<<<<<< Updated upstream
-<<<<<<< Updated upstream
-<<<<<<< Updated upstream
-Provides:       product_flavor(openSUSE) = 20210507-0
-=======
-Provides:       product_flavor(openSUSE) = 20210508-0
->>>>>>> Stashed changes
-=======
-Provides:       product_flavor(openSUSE) = 20210508-0
->>>>>>> Stashed changes
-=======
-Provides:       product_flavor(openSUSE) = 20210508-0
->>>>>>> Stashed changes
-=======
-Provides:       product_flavor(openSUSE) = 20210510-0
->>>>>>> Stashed changes
-=======
-Provides:       product_flavor(openSUSE) = 20210510-0
->>>>>>> Stashed changes
+Provides:       product_flavor(openSUSE) = 20210511-0
 Summary:        openSUSE Tumbleweed%{?betaversion: %{betaversion}}
 
 %description livecd-gnome
@@ -476,27 +296,7 @@ License:        BSD-3-Clause
 Group:          System/Fhs
 Provides:       product_flavor()
 Provides:       flavor(livecd-xfce)
-<<<<<<< Updated upstream
-<<<<<<< Updated upstream
-<<<<<<< Updated upstream
-<<<<<<< Updated upstream
-<<<<<<< Updated upstream
-Provides:       product_flavor(openSUSE) = 20210507-0
-=======
-Provides:       product_flavor(openSUSE) = 20210508-0
->>>>>>> Stashed changes
-=======
-Provides:       product_flavor(openSUSE) = 20210508-0
->>>>>>> Stashed changes
-=======
-Provides:       product_flavor(openSUSE) = 20210508-0
->>>>>>> Stashed changes
-=======
-Provides:       product_flavor(openSUSE) = 20210510-0
->>>>>>> Stashed changes
-=======
-Provides:       product_flavor(openSUSE) = 20210510-0
->>>>>>> Stashed changes
+Provides:       product_flavor(openSUSE) = 20210511-0
 Summary:        openSUSE Tumbleweed%{?betaversion: %{betaversion}}
 
 %description livecd-xfce
@@ -511,27 +311,7 @@ License:        BSD-3-Clause
 Group:          System/Fhs
 Provides:       product_flavor()
 Provides:       flavor(usb-kde)
-<<<<<<< Updated upstream
-<<<<<<< Updated upstream
-<<<<<<< Updated upstream
-<<<<<<< Updated upstream
-<<<<<<< Updated upstream
-Provides:       product_flavor(openSUSE) = 20210507-0
-=======
-Provides:       product_flavor(openSUSE) = 20210508-0
->>>>>>> Stashed changes
-=======
-Provides:       product_flavor(openSUSE) = 20210508-0
->>>>>>> Stashed changes
-=======
-Provides:       product_flavor(openSUSE) = 20210508-0
->>>>>>> Stashed changes
-=======
-Provides:       product_flavor(openSUSE) = 20210510-0
->>>>>>> Stashed changes
-=======
-Provides:       product_flavor(openSUSE) = 20210510-0
->>>>>>> Stashed changes
+Provides:       product_flavor(openSUSE) = 20210511-0
 Summary:        openSUSE Tumbleweed%{?betaversion: %{betaversion}}
 
 %description usb-kde
@@ -546,27 +326,7 @@ License:        BSD-3-Clause
 Group:          System/Fhs
 Provides:       product_flavor()
 Provides:       flavor(usb-gnome)
-<<<<<<< Updated upstream
-<<<<<<< Updated upstream
-<<<<<<< Updated upstream
-<<<<<<< Updated upstream
-<<<<<<< Updated upstream
-Provides:       product_flavor(openSUSE) = 20210507-0
-=======
-Provides:       product_flavor(openSUSE) = 20210508-0
->>>>>>> Stashed changes
-=======
-Provides:       product_flavor(openSUSE) = 20210508-0
->>>>>>> Stashed changes
-=======
-Provides:       product_flavor(openSUSE) = 20210508-0
->>>>>>> Stashed changes
-=======
-Provides:       product_flavor(openSUSE) = 20210510-0
->>>>>>> Stashed changes
-=======
-Provides:       product_flavor(openSUSE) = 20210510-0
->>>>>>> Stashed changes
+Provides:       product_flavor(openSUSE) = 20210511-0
 Summary:        openSUSE Tumbleweed%{?betaversion: %{betaversion}}
 
 %description usb-gnome
@@ -581,27 +341,7 @@ License:        BSD-3-Clause
 Group:          System/Fhs
 Provides:       product_flavor()
 Provides:       flavor(usb-x11)
-<<<<<<< Updated upstream
-<<<<<<< Updated upstream
-<<<<<<< Updated upstream
-<<<<<<< Updated upstream
-<<<<<<< Updated upstream
-Provides:       product_flavor(openSUSE) = 20210507-0
-=======
-Provides:       product_flavor(openSUSE) = 20210508-0
->>>>>>> Stashed changes
-=======
-Provides:       product_flavor(openSUSE) = 20210508-0
->>>>>>> Stashed changes
-=======
-Provides:       product_flavor(openSUSE) = 20210508-0
->>>>>>> Stashed changes
-=======
-Provides:       product_flavor(openSUSE) = 20210510-0
->>>>>>> Stashed changes
-=======
-Provides:       product_flavor(openSUSE) = 20210510-0
->>>>>>> Stashed changes
+Provides:       product_flavor(openSUSE) = 20210511-0
 Summary:        openSUSE Tumbleweed%{?betaversion: %{betaversion}}
 
 %description usb-x11
@@ -616,27 +356,7 @@ License:        BSD-3-Clause
 Group:          System/Fhs
 Provides:       product_flavor()
 Provides:       flavor(appliance)
-<<<<<<< Updated upstream
-<<<<<<< Updated upstream
-<<<<<<< Updated upstream
-<<<<<<< Updated upstream
-<<<<<<< Updated upstream
-Provides:       product_flavor(openSUSE) = 20210507-0
-=======
-Provides:       product_flavor(openSUSE) = 20210508-0
->>>>>>> Stashed changes
-=======
-Provides:       product_flavor(openSUSE) = 20210508-0
->>>>>>> Stashed changes
-=======
-Provides:       product_flavor(openSUSE) = 20210508-0
->>>>>>> Stashed changes
-=======
-Provides:       product_flavor(openSUSE) = 20210510-0
->>>>>>> Stashed changes
-=======
-Provides:       product_flavor(openSUSE) = 20210510-0
->>>>>>> Stashed changes
+Provides:       product_flavor(openSUSE) = 20210511-0
 Summary:        openSUSE Tumbleweed%{?betaversion: %{betaversion}}
 
 %description appliance
@@ -651,27 +371,7 @@ License:        BSD-3-Clause
 Group:          System/Fhs
 Provides:       product_flavor()
 Provides:       flavor(appliance-docker)
-<<<<<<< Updated upstream
-<<<<<<< Updated upstream
-<<<<<<< Updated upstream
-<<<<<<< Updated upstream
-<<<<<<< Updated upstream
-Provides:       product_flavor(openSUSE) = 20210507-0
-=======
-Provides:       product_flavor(openSUSE) = 20210508-0
->>>>>>> Stashed changes
-=======
-Provides:       product_flavor(openSUSE) = 20210508-0
->>>>>>> Stashed changes
-=======
-Provides:       product_flavor(openSUSE) = 20210508-0
->>>>>>> Stashed changes
-=======
-Provides:       product_flavor(openSUSE) = 20210510-0
->>>>>>> Stashed changes
-=======
-Provides:       product_flavor(openSUSE) = 20210510-0
->>>>>>> Stashed changes
+Provides:       product_flavor(openSUSE) = 20210511-0
 Summary:        openSUSE Tumbleweed%{?betaversion: %{betaversion}}
 
 %description appliance-docker
@@ -686,27 +386,7 @@ License:        BSD-3-Clause
 Group:          System/Fhs
 Provides:       product_flavor()
 Provides:       flavor(appliance-kvm)
-<<<<<<< Updated upstream
-<<<<<<< Updated upstream
-<<<<<<< Updated upstream
-<<<<<<< Updated upstream
-<<<<<<< Updated upstream
-Provides:       product_flavor(openSUSE) = 20210507-0
-=======
-Provides:       product_flavor(openSUSE) = 20210508-0
->>>>>>> Stashed changes
-=======
-Provides:       product_flavor(openSUSE) = 20210508-0
->>>>>>> Stashed changes
-=======
-Provides:       product_flavor(openSUSE) = 20210508-0
->>>>>>> Stashed changes
-=======
-Provides:       product_flavor(openSUSE) = 20210510-0
->>>>>>> Stashed changes
-=======
-Provides:       product_flavor(openSUSE) = 20210510-0
->>>>>>> Stashed changes
+Provides:       product_flavor(openSUSE) = 20210511-0
 Summary:        openSUSE Tumbleweed%{?betaversion: %{betaversion}}
 
 %description appliance-kvm
@@ -721,27 +401,7 @@ License:        BSD-3-Clause
 Group:          System/Fhs
 Provides:       product_flavor()
 Provides:       flavor(appliance-vmware)
-<<<<<<< Updated upstream
-<<<<<<< Updated upstream
-<<<<<<< Updated upstream
-<<<<<<< Updated upstream
-<<<<<<< Updated upstream
-Provides:       product_flavor(openSUSE) = 20210507-0
-=======
-Provides:       product_flavor(openSUSE) = 20210508-0
->>>>>>> Stashed changes
-=======
-Provides:       product_flavor(openSUSE) = 20210508-0
->>>>>>> Stashed changes
-=======
-Provides:       product_flavor(openSUSE) = 20210508-0
->>>>>>> Stashed changes
-=======
-Provides:       product_flavor(openSUSE) = 20210510-0
->>>>>>> Stashed changes
-=======
-Provides:       product_flavor(openSUSE) = 20210510-0
->>>>>>> Stashed changes
+Provides:       product_flavor(openSUSE) = 20210511-0
 Summary:        openSUSE Tumbleweed%{?betaversion: %{betaversion}}
 
 %description appliance-vmware
@@ -756,27 +416,7 @@ License:        BSD-3-Clause
 Group:          System/Fhs
 Provides:       product_flavor()
 Provides:       flavor(appliance-openstack)
-<<<<<<< Updated upstream
-<<<<<<< Updated upstream
-<<<<<<< Updated upstream
-<<<<<<< Updated upstream
-<<<<<<< Updated upstream
-Provides:       product_flavor(openSUSE) = 20210507-0
-=======
-Provides:       product_flavor(openSUSE) = 20210508-0
->>>>>>> Stashed changes
-=======
-Provides:       product_flavor(openSUSE) = 20210508-0
->>>>>>> Stashed changes
-=======
-Provides:       product_flavor(openSUSE) = 20210508-0
->>>>>>> Stashed changes
-=======
-Provides:       product_flavor(openSUSE) = 20210510-0
->>>>>>> Stashed changes
-=======
-Provides:       product_flavor(openSUSE) = 20210510-0
->>>>>>> Stashed changes
+Provides:       product_flavor(openSUSE) = 20210511-0
 Summary:        openSUSE Tumbleweed%{?betaversion: %{betaversion}}
 
 %description appliance-openstack
@@ -791,27 +431,7 @@ License:        BSD-3-Clause
 Group:          System/Fhs
 Provides:       product_flavor()
 Provides:       flavor(appliance-hyperv)
-<<<<<<< Updated upstream
-<<<<<<< Updated upstream
-<<<<<<< Updated upstream
-<<<<<<< Updated upstream
-<<<<<<< Updated upstream
-Provides:       product_flavor(openSUSE) = 20210507-0
-=======
-Provides:       product_flavor(openSUSE) = 20210508-0
->>>>>>> Stashed changes
-=======
-Provides:       product_flavor(openSUSE) = 20210508-0
->>>>>>> Stashed changes
-=======
-Provides:       product_flavor(openSUSE) = 20210508-0
->>>>>>> Stashed changes
-=======
-Provides:       product_flavor(openSUSE) = 20210510-0
->>>>>>> Stashed changes
-=======
-Provides:       product_flavor(openSUSE) = 20210510-0
->>>>>>> Stashed changes
+Provides:       product_flavor(openSUSE) = 20210511-0
 Summary:        openSUSE Tumbleweed%{?betaversion: %{betaversion}}
 
 %description appliance-hyperv
@@ -826,27 +446,7 @@ License:        BSD-3-Clause
 Group:          System/Fhs
 Provides:       product_flavor()
 Provides:       flavor(appliance-vagrant)
-<<<<<<< Updated upstream
-<<<<<<< Updated upstream
-<<<<<<< Updated upstream
-<<<<<<< Updated upstream
-<<<<<<< Updated upstream
-Provides:       product_flavor(openSUSE) = 20210507-0
-=======
-Provides:       product_flavor(openSUSE) = 20210508-0
->>>>>>> Stashed changes
-=======
-Provides:       product_flavor(openSUSE) = 20210508-0
->>>>>>> Stashed changes
-=======
-Provides:       product_flavor(openSUSE) = 20210508-0
->>>>>>> Stashed changes
-=======
-Provides:       product_flavor(openSUSE) = 20210510-0
->>>>>>> Stashed changes
-=======
-Provides:       product_flavor(openSUSE) = 20210510-0
->>>>>>> Stashed changes
+Provides:       product_flavor(openSUSE) = 20210511-0
 Summary:        openSUSE Tumbleweed%{?betaversion: %{betaversion}}
 
 %description appliance-vagrant
@@ -861,27 +461,7 @@ License:        BSD-3-Clause
 Group:          System/Fhs
 Provides:       product_flavor()
 Provides:       flavor(appliance-wsl)
-<<<<<<< Updated upstream
-<<<<<<< Updated upstream
-<<<<<<< Updated upstream
-<<<<<<< Updated upstream
-<<<<<<< Updated upstream
-Provides:       product_flavor(openSUSE) = 20210507-0
-=======
-Provides:       product_flavor(openSUSE) = 20210508-0
->>>>>>> Stashed changes
-=======
-Provides:       product_flavor(openSUSE) = 20210508-0
->>>>>>> Stashed changes
-=======
-Provides:       product_flavor(openSUSE) = 20210508-0
->>>>>>> Stashed changes
-=======
-Provides:       product_flavor(openSUSE) = 20210510-0
->>>>>>> Stashed changes
-=======
-Provides:       product_flavor(openSUSE) = 20210510-0
->>>>>>> Stashed changes
+Provides:       product_flavor(openSUSE) = 20210511-0
 Summary:        openSUSE Tumbleweed%{?betaversion: %{betaversion}}
 
 %description appliance-wsl
@@ -896,27 +476,7 @@ License:        BSD-3-Clause
 Group:          System/Fhs
 Provides:       product_flavor()
 Provides:       flavor(appliance-custom)
-<<<<<<< Updated upstream
-<<<<<<< Updated upstream
-<<<<<<< Updated upstream
-<<<<<<< Updated upstream
-<<<<<<< Updated upstream
-Provides:       product_flavor(openSUSE) = 20210507-0
-=======
-Provides:       product_flavor(openSUSE) = 20210508-0
->>>>>>> Stashed changes
-=======
-Provides:       product_flavor(openSUSE) = 20210508-0
->>>>>>> Stashed changes
-=======
-Provides:       product_flavor(openSUSE) = 20210508-0
->>>>>>> Stashed changes
-=======
-Provides:       product_flavor(openSUSE) = 20210510-0
->>>>>>> Stashed changes
-=======
-Provides:       product_flavor(openSUSE) = 20210510-0
->>>>>>> Stashed changes
+Provides:       product_flavor(openSUSE) = 20210511-0
 Summary:        openSUSE Tumbleweed%{?betaversion: %{betaversion}}
 
 %description appliance-custom
@@ -991,45 +551,10 @@ cat >$RPM_BUILD_ROOT/etc/products.d/openSUSE.prod << EOF
 <product schemeversion="0">
   <vendor>openSUSE</vendor>
   <name>openSUSE</name>
-<<<<<<< Updated upstream
-<<<<<<< Updated upstream
-<<<<<<< Updated upstream
-<<<<<<< Updated upstream
-<<<<<<< Updated upstream
-  <version>20210507</version>
+  <version>20210511</version>
   <release>0</release>
   <arch>%{_target_cpu}</arch>
-  <cpeid>cpe:/o:opensuse:opensuse:20210507</cpeid>
-=======
-  <version>20210508</version>
-  <release>0</release>
-  <arch>%{_target_cpu}</arch>
-  <cpeid>cpe:/o:opensuse:opensuse:20210508</cpeid>
->>>>>>> Stashed changes
-=======
-  <version>20210508</version>
-  <release>0</release>
-  <arch>%{_target_cpu}</arch>
-  <cpeid>cpe:/o:opensuse:opensuse:20210508</cpeid>
->>>>>>> Stashed changes
-=======
-  <version>20210508</version>
-  <release>0</release>
-  <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
-=======
-  <version>20210510</version>
-  <release>0</release>
-  <arch>%{_target_cpu}</arch>
-  <cpeid>cpe:/o:opensuse:opensuse:20210510</cpeid>
->>>>>>> Stashed changes
+  <cpeid>cpe:/o:opensuse:opensuse:20210511</cpeid>
   <productline>openSUSE</productline>
   <register>
     <pool>
diff --git a/weakremovers.inc b/weakremovers.inc
index 407569b..c4fc7ca 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)
@@ -17932,7 +17931,6 @@ Provides: weakremover(python3-discover)
 Provides: weakremover(python3-django-allauth-lang)
 Provides: weakremover(python3-django-babel)
 Provides: weakremover(python3-django-celery)
-Provides: weakremover(python3-django-mailman3)
 Provides: weakremover(python3-doc)
 Provides: weakremover(python3-doc-devhelp)
 Provides: weakremover(python3-docker-py-test)
@@ -18339,6 +18337,7 @@ Provides: weakremover(python36-scikit-sound)
 Provides: weakremover(python36-scipy)
 Provides: weakremover(python36-seaborn)
 Provides: weakremover(python36-sfs)
+Provides: weakremover(python36-sge-pygame)
 Provides: weakremover(python36-sgp4)
 Provides: weakremover(python36-sklearn-pandas)
 Provides: weakremover(python36-snuggs)
@@ -18384,7 +18383,6 @@ Provides: weakremover(python38-ara)
 Provides: weakremover(python38-bcolz)
 Provides: weakremover(python38-bump2version)
 Provides: weakremover(python38-cluster-preflight-check)
-Provides: weakremover(python38-django-mailman3)
 Provides: weakremover(python38-dogpile.cache)
 Provides: weakremover(python38-dtaidistance-devel)
 Provides: weakremover(python38-featureflow)