Error: Auto-merging scripts/tools-versions-darwin.yml CONFLICT (content): Merge conflict in scripts/tools-versions-darwin.yml Auto-merging scripts/tools-versions-linux.yml CONFLICT (content): Merge conflict in scripts/tools-versions-linux.yml Auto-merging scripts/tools-versions-win10.yml CONFLICT (content): Merge conflict in scripts/tools-versions-win10.yml error: could not apply d70cec101d... tools: Update nrfutil device to 2.15.7 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 set advice.mergeConflict false"