git checkout --ours $(git diff --name-only --diff-filter=U) && git add -A && git commit -m "Resolve conflicts preferring branch changes" && git push
