CONFLICT

CONFLICT (content): Merge conflict in xxxxx
Automatic merge failed; fix conflicts and then commit the result.

git push [ -v | --set-upstream | -o | --set-upstream origin master | -u origin main | origin master | -u origin master | --delete master | -u | origin HEAD | --dry-run ], Git: upstream, git push --force