fix: merge conflicts

public/locales/en/country.json

@@ -30,7 +30,6 @@
     "bosnia_and_herzegovina": "Bosnia and herzegovina",
     "botswana": "Botswana",
     "brazil": "Brazil",
-    "british_indian_ocean_territory": "British indian ocean territory",
     "british_virgin_islands": "British virgin islands",
     "brunei": "Brunei",
     "bulgaria": "Bulgaria",
@@ -45,8 +44,6 @@
     "chad": "Chad",
     "chile": "Chile",
     "china": "China",
-    "christmas_island": "Christmas island",
-    "cocos_keeling_islands": "Cocos keeling islands",
     "colombia": "Colombia",
     "comoros": "Comoros",
     "congo_brazzaville": "Congo brazzaville",