Error: Auto-merging drivers/flash/flash_mcux_flexspi_nor.c CONFLICT (content): Merge conflict in drivers/flash/flash_mcux_flexspi_nor.c error: could not apply c12030acb9d... drivers: flash: flash_mcux_flexspi_nor: check all 3 bytes of JEDEC ID 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"