git merge feature/Australia
97 conflicts
git commit -am 'Whatever, I'm tired.'
git push -f