diff --git a/sys-fs/dwarfs/dwarfs-0.5.4-r3.ebuild b/sys-fs/dwarfs/dwarfs-0.5.4-r3.ebuild
index f45a47b0b9..fb546ce277 100644
--- a/sys-fs/dwarfs/dwarfs-0.5.4-r3.ebuild
+++ b/sys-fs/dwarfs/dwarfs-0.5.4-r3.ebuild
@@ -57,7 +57,6 @@ BDEPEND="
 
 	test? ( dev-cpp/gtest )
 "
->>>>>>> f29f4045 (sys-fs/dwarfs: unbundling WIP):sys-fs/dwarfs/dwarfs-0.5.4-r1.ebuild
 
 CHECKREQS_DISK_BUILD="1300M"
 
diff --git a/sys-fs/dwarfs/files/unbundle-folly-fbthrift.patch b/sys-fs/dwarfs/files/unbundle-folly-fbthrift.patch
index 62f4ee1f90..853ebe0461 100644
--- a/sys-fs/dwarfs/files/unbundle-folly-fbthrift.patch
+++ b/sys-fs/dwarfs/files/unbundle-folly-fbthrift.patch
@@ -1,5 +1,5 @@
---- CMakeLists.txt	2021-04-28 16:56:24.432666631 +0200
-+++ CMakeLists.txt2	2021-04-28 17:00:04.622812742 +0200
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
 @@ -298,7 +298,7 @@
  if(WITH_TESTS OR WITH_BENCHMARKS)
    add_library(test_helpers test/test_helpers.cpp test/test_strings.cpp