Error: Auto-merging subsys/bluetooth/controller/ll_sw/nordic/lll/lll_scan.c CONFLICT (content): Merge conflict in subsys/bluetooth/controller/ll_sw/nordic/lll/lll_scan.c Auto-merging subsys/bluetooth/controller/ll_sw/nordic/lll/lll_scan_aux.c Auto-merging subsys/bluetooth/controller/ll_sw/nordic/lll/lll_sync.c Auto-merging subsys/bluetooth/controller/ll_sw/ull_scan_aux.c CONFLICT (content): Merge conflict in subsys/bluetooth/controller/ll_sw/ull_scan_aux.c error: could not apply c334ed515b0... Bluetooth: Controller: Fix multiple Extended Adv chain reception 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"

Error: Auto-merging subsys/bluetooth/controller/ll_sw/nordic/lll/lll_scan.c Auto-merging subsys/bluetooth/controller/ll_sw/nordic/lll/lll_scan_aux.c Auto-merging subsys/bluetooth/controller/ll_sw/nordic/lll/lll_sync.c Auto-merging subsys/bluetooth/controller/ll_sw/ull_scan_aux.c CONFLICT (content): Merge conflict in subsys/bluetooth/controller/ll_sw/ull_scan_aux.c error: could not apply c334ed515b0... Bluetooth: Controller: Fix multiple Extended Adv chain reception 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"