diff --git a/config/rootfiles/packages/aarch64/samba b/config/rootfiles/packages/aarch64/samba
index ddc964c5c..88b7905ce 100644
--- a/config/rootfiles/packages/aarch64/samba
+++ b/config/rootfiles/packages/aarch64/samba
@@ -701,11 +701,7 @@ usr/lib/samba/libposix-eadb-samba4.so
 usr/lib/samba/libprinter-driver-samba4.so
 usr/lib/samba/libprinting-migrate-samba4.so
 usr/lib/samba/libpyldb-util.cpython-38-aarch64-linux-gnu.so.2
-<<<<<<< HEAD
-usr/lib/samba/libpyldb-util.cpython-38-aarch64-linux-gnu.so.2.2.1
-=======
 usr/lib/samba/libpyldb-util.cpython-38-aarch64-linux-gnu.so.2.3.0
->>>>>>> next
 usr/lib/samba/libpytalloc-util.cpython-38-aarch64-linux-gnu.so.2
 usr/lib/samba/libpytalloc-util.cpython-38-aarch64-linux-gnu.so.2.3.2
 usr/lib/samba/libregistry-samba4.so
diff --git a/config/rootfiles/packages/i586/samba b/config/rootfiles/packages/i586/samba
index d302dd703..6b43544f1 100644
--- a/config/rootfiles/packages/i586/samba
+++ b/config/rootfiles/packages/i586/samba
@@ -701,11 +701,7 @@ usr/lib/samba/libposix-eadb-samba4.so
 usr/lib/samba/libprinter-driver-samba4.so
 usr/lib/samba/libprinting-migrate-samba4.so
 usr/lib/samba/libpyldb-util.cpython-38-i386-linux-gnu.so.2
-<<<<<<< HEAD
-usr/lib/samba/libpyldb-util.cpython-38-i386-linux-gnu.so.2.2.1
-=======
 usr/lib/samba/libpyldb-util.cpython-38-i386-linux-gnu.so.2.3.0
->>>>>>> next
 usr/lib/samba/libpytalloc-util.cpython-38-i386-linux-gnu.so.2
 usr/lib/samba/libpytalloc-util.cpython-38-i386-linux-gnu.so.2.3.2
 usr/lib/samba/libregistry-samba4.so