diff --git a/.rev b/.rev
index 95af78f..be80d68 100644
--- a/.rev
+++ b/.rev
@@ -3869,4 +3869,19 @@
     <comment></comment>
     <requestid>851301</requestid>
   </revision>
+<<<<<<< Updated upstream
+=======
+  <revision rev="477" vrev="1">
+    <srcmd5>b90c95a4417b628b787c7798db17f964</srcmd5>
+    <version>84.87+git20210308.d7a7d3a</version>
+    <time>1615489615</time>
+    <user>dimstar_suse</user>
+    <comment>- Update to version 84.87+git20210308.d7a7d3a:
+  * excluding new kernel string in version search
+  * Fixing possible resource leak. Found by running ccpcheck on the source code.
+  * Comment out 8-bit C1 conflicting with UTF-8 in /etc/inputrc
+  * Fix keyseq specifications in /etc/inputrc{,.keys}</comment>
+    <requestid>877770</requestid>
+  </revision>
+>>>>>>> Stashed changes
 </revisionlist>
diff --git a/.servicemark b/.servicemark
index 242f195..a4fae22 100644
--- a/.servicemark
+++ b/.servicemark
@@ -1 +1,5 @@
+<<<<<<< Updated upstream
 f63effe819d5dcd8751addcfc0dc9386
+=======
+6488d05fc988e8c2d2e32c9999b80675
+>>>>>>> Stashed changes
diff --git a/_servicedata b/_servicedata
index 51466b5..3df512e 100644
--- a/_servicedata
+++ b/_servicedata
@@ -1,6 +1,10 @@
 <servicedata>
 <service name="tar_scm">
     <param name="url">https://github.com/openSUSE/aaa_base.git</param>
+<<<<<<< Updated upstream
     <param name="changesrevision">4f16b1614fac8432188271c8363b1e6217944b4c</param>
+=======
+    <param name="changesrevision">d7a7d3adc3b583e0951b985aa4f72ec3f6e58415</param>
+>>>>>>> Stashed changes
 </service>
 </servicedata>
\ No newline at end of file
diff --git a/aaa_base-84.87+git20210308.d7a7d3a.tar.xz b/aaa_base-84.87+git20210308.d7a7d3a.tar.xz
new file mode 120000
index 0000000..fccc43d
--- /dev/null
+++ b/aaa_base-84.87+git20210308.d7a7d3a.tar.xz
@@ -0,0 +1 @@
+/ipfs/bafkreigrrmdhzkoqo4zwqj43zmpb2poup55w7omyeqz7bken6ddltaqm44
\ No newline at end of file
diff --git a/aaa_base.changes b/aaa_base.changes
index 6bc77df..4e22ec5 100644
--- a/aaa_base.changes
+++ b/aaa_base.changes
@@ -1,4 +1,16 @@
 -------------------------------------------------------------------
+<<<<<<< Updated upstream
+=======
+Mon Mar 08 15:11:13 UTC 2021 - ro@suse.de
+
+- Update to version 84.87+git20210308.d7a7d3a:
+  * excluding new kernel string in version search
+  * Fixing possible resource leak. Found by running ccpcheck on the source code.
+  * Comment out 8-bit C1 conflicting with UTF-8 in /etc/inputrc
+  * Fix keyseq specifications in /etc/inputrc{,.keys}
+
+-------------------------------------------------------------------
+>>>>>>> Stashed changes
 Mon Nov 23 09:41:55 UTC 2020 - Ludwig Nussel <lnussel@suse.de>
 
 - clean up rpmlintrc. Add filter for deprecated init scripts. We'll have to
diff --git a/aaa_base.spec b/aaa_base.spec
index ed01a24..adca968 100644
--- a/aaa_base.spec
+++ b/aaa_base.spec
@@ -1,7 +1,7 @@
 #
 # spec file for package aaa_base
 #
-# Copyright (c) 2020 SUSE LLC
+# Copyright (c) 2021 SUSE LLC
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -23,7 +23,11 @@
 %endif
 
 Name:           aaa_base
+<<<<<<< Updated upstream
 Version:        84.87+git20201123.4f16b16
+=======
+Version:        84.87+git20210308.d7a7d3a
+>>>>>>> Stashed changes
 Release:        0
 URL:            https://github.com/openSUSE/aaa_base
 # do not require systemd - aaa_base is in the build environment and we don't
@@ -39,7 +43,12 @@ Requires:       /usr/bin/tput
 Requires:       /usr/bin/xz
 Requires:       distribution-release
 Requires:       filesystem
-Recommends:     logrotate netcfg udev iputils iproute2 aaa_base-extras
+Recommends:     aaa_base-extras
+Recommends:     iproute2
+Recommends:     iputils
+Recommends:     logrotate
+Recommends:     netcfg
+Recommends:     udev
 Requires(pre):  /usr/bin/rm
 Requires(pre):  glibc >= 2.30
 Requires(post): fillup /usr/bin/chmod /usr/bin/chown