1428 failed to apply on top of branch "stable/2024.1":
Applying: Add neutron policy server support
Applying: use neutron image
Using index info to reconstruct a base tree...
M images/neutron/Dockerfile
M roles/defaults/vars/main.yml
Falling back to patching base and 3-way merge...
Auto-merging roles/defaults/vars/main.yml
Auto-merging images/neutron/Dockerfile
CONFLICT (content): Merge conflict in images/neutron/Dockerfile
Removing images/neutron-policy-server/Dockerfile
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
Patch failed at 0002 use neutron image
When you have resolved this problem, run "git am --continue".
If you prefer to skip this patch, run "git am --skip" instead.
To restore the original branch and stop patching, run "git am --abort".
Manual cherrypick required.
1428 failed to apply on top of branch "stable/2024.1":