diff --git a/west.yml b/west.yml
index 9b5ec90fd150..56a2a63258d2 100644
--- a/west.yml
+++ b/west.yml
@@ -158,7 +158,11 @@ manifest:
     - name: matter
       repo-path: sdk-connectedhomeip
       path: modules/lib/matter
+<<<<<<< HEAD
       revision: 93c712e6e0be9211507cb9e559860b32daa984ed
+=======
+      revision: pull/499/head
+>>>>>>> 9f524815dc9 (manifest: Update sdk-connectedhomeip revision (auto-manifest PR))
       west-commands: scripts/west/west-commands.yml
       submodules:
         - name: nlio