if u ever get a tricky merge conflict, just git push --force. this automatically works out the right code to keep (your own)