diff --git a/meta-python/recipes-devtools/python/python3-soupsieve_4.1.bb b/meta-python/recipes-devtools/python/python3-soupsieve_4.1.1.bb
similarity index 53%
rename from meta-python/recipes-devtools/python/python3-soupsieve_4.1.bb
rename to meta-python/recipes-devtools/python/python3-soupsieve_4.1.1.bb
index bd35cf8e41..454beb5f15 100644
--- a/meta-python/recipes-devtools/python/python3-soupsieve_4.1.bb
+++ b/meta-python/recipes-devtools/python/python3-soupsieve_4.1.1.bb
@@ -4,7 +4,13 @@ HOMEPAGE = "https://github.com/facelessuser/soupsieve"
 LICENSE = "MIT"
 LIC_FILES_CHKSUM = "file://LICENSE.md;md5=74851a2f1e5c07496dcb452af6a6bf54"
 
+<<<<<<<< HEAD:meta-python/recipes-devtools/python/python3-soupsieve_4.1.bb
 SRC_URI[sha256sum] = "ca9abf7126667010d8f6e9b39bfc1bc3b23c8aed9bcb0f54a754dde969bb8aab"
+|||||||| parent of 695f7967e7 (python3-soupsieve: upgrade 4.0.1 -> 4.1.1):meta-python/recipes-devtools/python/python3-soupsieve_4.0.1.bb
+SRC_URI[sha256sum] = "7621e3c5f6b371ed2c5eabaac5de300ac3d66d05e6d7f34783e31b63c4f90c75"
+========
+SRC_URI[sha256sum] = "b296bd2d2f65b1a78149f3d7bf6736a147d2c9e2dfbde0e4404639d748a02e03"
+>>>>>>>> 695f7967e7 (python3-soupsieve: upgrade 4.0.1 -> 4.1.1):meta-python/recipes-devtools/python/python3-soupsieve_4.1.1.bb
 
 inherit pypi python_hatchling ptest-python-pytest
 
