diff --git a/local/recipes/kde/kf6-kcmutils/recipe.toml b/local/recipes/kde/kf6-kcmutils/recipe.toml
index 4bf9aedfa3..f663826605 100644
--- a/local/recipes/kde/kf6-kcmutils/recipe.toml
+++ b/local/recipes/kde/kf6-kcmutils/recipe.toml
@@ -28,17 +28,7 @@ DYNAMIC_INIT
 
 HOST_BUILD="${COOKBOOK_ROOT}/build/qt-host-build"
 
-<<<<<<< Updated upstream
 redbear_qt_link_sysroot_dirs "${COOKBOOK_SYSROOT}" plugins mkspecs metatypes modules qml
-
-=======
-redbear_qt_link_sysroot_dirs "${COOKBOOK_SYSROOT}" plugins mkspecs metatypes modules
-
-# The local source tree is now at upstream 6.27.0 with QML/Quick/kcmshell
-# restored. Only poqm translations remain disabled (lupdate/lrelease not yet
-# built for target). The Red Bear-specific changes live as a durable external
-# patch in local/patches/kf6-kcmutils/.
->>>>>>> Stashed changes
 REDBEAR_PATCHES_DIR="${REDBEAR_PATCHES_DIR:-$(cd "$(dirname "${COOKBOOK_RECIPE}")/../../../.." && pwd)}/local/patches/kf6-kcmutils"
 cookbook_apply_patches "${REDBEAR_PATCHES_DIR}"
 
diff --git a/local/recipes/kde/kf6-kcmutils/source/CMakeLists.txt b/local/recipes/kde/kf6-kcmutils/source/CMakeLists.txt
index 54facff24d..a903db7dc4 100644
--- a/local/recipes/kde/kf6-kcmutils/source/CMakeLists.txt
+++ b/local/recipes/kde/kf6-kcmutils/source/CMakeLists.txt
@@ -74,11 +74,7 @@ ecm_set_disabled_deprecation_versions(
 ecm_find_qmlmodule(org.kde.kirigami REQUIRED)
 
 add_definitions(-DTRANSLATION_DOMAIN=\"kcmutils6\")
-<<<<<<< Updated upstream
-#ki18n_install(po)  # translations deferred
-=======
 #ki18n_install(po)  # translations deferred until lupdate/lrelease is built for target
->>>>>>> Stashed changes
 add_subdirectory(src)
 add_subdirectory(tools)
 if(BUILD_TESTING)