formatting country names to be less shouty
conflict resolution yay