Yiran fixed syntax error, deleted duplicated entries, fixed conflicts marks in country_explorer.html