error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch