Attempted to fix country explorer file again

The first time I fixed the conflicts that I saw when I did git pull upstream master, which were completely different from the conflicts in this second time.