Switched to a new branch '20220920130404.39806-1-pbonzini@redhat.com' Applying: models: add denormalized Project link to Result Using index info to reconstruct a base tree... M api/models.py Falling back to patching base and 3-way merge... Auto-merging api/models.py CONFLICT (content): Merge conflict in api/models.py error: Failed to merge in the changes. hint: Use 'git am --show-current-patch=diff' to see the failed patch Patch failed at 0001 models: add denormalized Project link to Result 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".