Fixed the merging conflict in the country explorer file