fixed conflicts

fixed conflicts in country_explorer.html