Switched to a new branch 'cover.1729809799.git.victorm.lira@amd.com'
Applying: build: add x86_64 xen artifacts (argo)
Using index info to reconstruct a base tree...
Falling back to patching base and 3-way merge...
CONFLICT (add/add): Merge conflict in .gitlab-ci.yml
Auto-merging .gitlab-ci.yml
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
hint: When you have resolved this problem, run "git am --continue".
hint: If you prefer to skip this patch, run "git am --skip" instead.
hint: To restore the original branch and stop patching, run "git am --abort".
hint: Disable this message with "git config advice.mergeConflict false"
Patch failed at 0001 build: add x86_64 xen artifacts (argo)