Error: Auto-merging samples/subsys/mgmt/mcumgr/smp_svr/src/bluetooth.c CONFLICT (content): Merge conflict in samples/subsys/mgmt/mcumgr/smp_svr/src/bluetooth.c error: could not apply 655be99fa7c... samples: mgmt: mcumgr: smp_svr: Fix re-advertise issue on connection hint: After resolving the conflicts, mark them with hint: "git add/rm <pathspec>", then run hint: "git cherry-pick --continue". hint: You can instead skip this commit with "git cherry-pick --skip". hint: To abort and get back to the state before "git cherry-pick", hint: run "git cherry-pick --abort". hint: Disable this message with "git config advice.mergeConflict false"