diff --git a/fluent-bit-4.0.0.bb b/fluent-bit-4.0.0.bb
index ee75e524372..14dc29ce339 100644
--- a/fluent-bit-4.0.0.bb
+++ b/fluent-bit-4.0.0.bb
@@ -16,11 +16,7 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=2ee41112a44fe7014dce33e26468ba93"
 SECTION = "net"
 
 PR = "r0"
-<<<<<<<< HEAD:fluent-bit-3.2.5.bb
-PV = "3.2.5"
-========
 PV = "4.0.0"
->>>>>>>> origin/master:fluent-bit-4.0.0.bb
 
 SRCREV = "v${PV}"
 SRC_URI = "git://github.com/fluent/fluent-bit.git;nobranch=1"