diff --git a/source-data/location_hierarchy.tsv b/source-data/location_hierarchy.tsv
index b595d8fd7..15837782b 100644
--- a/source-data/location_hierarchy.tsv
+++ b/source-data/location_hierarchy.tsv
@@ -1,4 +1,49 @@
 region	country	division	location
+<<<<<<< HEAD			
+<<<<<<< HEAD			
+<<<<<<< HEAD			
+<<<<<<< HEAD			
+<<<<<<< HEAD			
+<<<<<<< HEAD			
+<<<<<<< HEAD			
+<<<<<<< HEAD			
+<<<<<<< HEAD			
+<<<<<<< HEAD			
+<<<<<<< HEAD			
+<<<<<<< HEAD			
+<<<<<<< HEAD			
+<<<<<<< HEAD			
+<<<<<<< HEAD			
+=======			
+=======			
+=======			
+=======			
+=======			
+=======			
+=======			
+=======			
+=======			
+=======			
+=======			
+=======			
+=======			
+=======			
+=======			
+>>>>>>> 4fde2e5... Automated commit: clean manually maintained tsvs			
+>>>>>>> 4fde2e5... Automated commit: clean manually maintained tsvs			
+>>>>>>> 4fde2e5... Automated commit: clean manually maintained tsvs			
+>>>>>>> 4fde2e5... Automated commit: clean manually maintained tsvs			
+>>>>>>> 4fde2e5... Automated commit: clean manually maintained tsvs			
+>>>>>>> 4fde2e5... Automated commit: clean manually maintained tsvs			
+>>>>>>> 4fde2e5... Automated commit: clean manually maintained tsvs			
+>>>>>>> 4fde2e5... Automated commit: clean manually maintained tsvs			
+>>>>>>> 4fde2e5... Automated commit: clean manually maintained tsvs			
+>>>>>>> 4fde2e5... Automated commit: clean manually maintained tsvs			
+>>>>>>> 4fde2e5... Automated commit: clean manually maintained tsvs			
+>>>>>>> 4fde2e5... Automated commit: clean manually maintained tsvs			
+>>>>>>> 4fde2e5... Automated commit: clean manually maintained tsvs			
+>>>>>>> 4fde2e5... Automated commit: clean manually maintained tsvs			
+>>>>>>> 4fde2e5... Automated commit: clean manually maintained tsvs			
 Africa	Algeria	Blida	
 Africa	Algeria	Boufarik	
 Africa	Benin	Cotonou	
@@ -348,16 +393,13 @@ Asia	India	West Bengal	Nadia
 Asia	India	West Bengal	North 24 Parganas
 Asia	India	West Bengal	South 24 Parganas
 Asia	India	West Bengal	Tehatta
-<<<<<<< HEAD
-Asia	Indonesia	Banten	
+Asia	India	West Bengal	
 Asia	Indonesia	Banten	Tangerang
+Asia	Indonesia	Banten	
 Asia	Indonesia	Central Java	
-Asia	Indonesia	East Kalimantan	
-=======
-Asia	India	West Bengal	
->>>>>>> 4fde2e5... Automated commit: clean manually maintained tsvs
 Asia	Indonesia	East Kalimantan	Samarinda
 Asia	Indonesia	East Kalimantan	
+Asia	Indonesia	East Kalimantan	
 Asia	Indonesia	Indonesia	
 Asia	Indonesia	Jakarta	
 Asia	Indonesia	North Sulawesi	Manado
@@ -497,9 +539,9 @@ Asia	South Korea	Gyeonggi Province
 Asia	South Korea	Seoul	Seoul
 Asia	South Korea	Seoul	
 Asia	South Korea	South Korea	
-Asia	Sri Lanka	Sri Lanka	
 Asia	Sri Lanka	Colombo	
 Asia	Sri Lanka	Kalutara	
+Asia	Sri Lanka	Sri Lanka	
 Asia	Taiwan	Keelung	
 Asia	Taiwan	New Taipei City	
 Asia	Taiwan	Tainan	
@@ -1038,11 +1080,8 @@ Europe	France	Pays de la Loire	Nantes
 Europe	France	Pays de la Loire	
 Europe	France	Provence-Alpes-Côte d'Azur	Embrun
 Europe	France	Provence-Alpes-Côte d'Azur	Marseille
-<<<<<<< HEAD
-Europe	France	Reunion	
-=======
 Europe	France	Provence-Alpes-Côte d'Azur	
->>>>>>> 4fde2e5... Automated commit: clean manually maintained tsvs
+Europe	France	Reunion	
 Europe	France	Toulouse	
 Europe	Germany	Baden-Wuerttemberg	Tuebingen
 Europe	Germany	Baden-Wuerttemberg	
@@ -1056,20 +1095,17 @@ Europe	Germany	Germany
 Europe	Germany	Hamburg	
 Europe	Germany	Niedersachsen	
 Europe	Germany	North Rhine Westphalia	Duesseldorf
-Europe	Germany	North Rhine Westphalia	Heinsberg District
 Europe	Germany	North Rhine Westphalia	Heinsberg
+Europe	Germany	North Rhine Westphalia	Heinsberg District
 Europe	Germany	North Rhine Westphalia	Münster
 Europe	Germany	North Rhine Westphalia	
 Europe	Germany	Rostock	
-Europe	Germany	Western Pomerania	
 Europe	Germany	Western Pomerania	Rostock
+Europe	Germany	Western Pomerania	
 Europe	Greece	Athens	
 Europe	Greece	Central Greece	Livadeia
-<<<<<<< HEAD
-Europe	Greece	Greece	
-=======
 Europe	Greece	Central Greece	
->>>>>>> 4fde2e5... Automated commit: clean manually maintained tsvs
+Europe	Greece	Greece	
 Europe	Greece	Thessaloniki	
 Europe	Hungary	Balassagyarmat	
 Europe	Hungary	Balatonfured	
@@ -1112,26 +1148,20 @@ Europe	Ireland	Wexford
 Europe	Ireland	Wicklow	
 Europe	Italy	Abruzzo	L'Aquila
 Europe	Italy	Abruzzo	Teramo
-<<<<<<< HEAD
+Europe	Italy	Abruzzo	
 Europe	Italy	Ancona	
-Europe	Italy	Apulia	
 Europe	Italy	Apulia	Bari
-=======
-Europe	Italy	Abruzzo	
->>>>>>> 4fde2e5... Automated commit: clean manually maintained tsvs
 Europe	Italy	Apulia	Brindisi
 Europe	Italy	Apulia	Lecce
 Europe	Italy	Apulia	Taranto
 Europe	Italy	Apulia	
-Europe	Italy	Basilicata	
-<<<<<<< HEAD
+Europe	Italy	Apulia	
 Europe	Italy	Basilicata	Potenza
-Europe	Italy	Campania	
-=======
->>>>>>> 4fde2e5... Automated commit: clean manually maintained tsvs
+Europe	Italy	Basilicata	
 Europe	Italy	Campania	Benevento
 Europe	Italy	Campania	Naples
 Europe	Italy	Campania	
+Europe	Italy	Campania	
 Europe	Italy	Castel di Sangro	
 Europe	Italy	Emilia-Romagna	
 Europe	Italy	Friuli Venezia Giulia	
@@ -1141,8 +1171,8 @@ Europe	Italy	Lazio	Rome
 Europe	Italy	Lazio	
 Europe	Italy	Lombardy	Milan
 Europe	Italy	Lombardy	
-Europe	Italy	Marche	
 Europe	Italy	Marche	Ancona
+Europe	Italy	Marche	
 Europe	Italy	Molise	
 Europe	Italy	Pa Trento	
 Europe	Italy	Sardinia	
@@ -1150,15 +1180,12 @@ Europe	Italy	Sicily
 Europe	Italy	South Tyrol	
 Europe	Italy	Trentino	
 Europe	Italy	Trentino-Alto Adige	
-Europe	Italy	Tuscany	
 Europe	Italy	Tuscany	Siena
+Europe	Italy	Tuscany	
 Europe	Italy	Valle D'Aosta	
 Europe	Italy	Veneto	Verona IT
-<<<<<<< HEAD
-Europe	Kosovo	Kosovo	
-=======
 Europe	Italy	Veneto	
->>>>>>> 4fde2e5... Automated commit: clean manually maintained tsvs
+Europe	Kosovo	Kosovo	
 Europe	Latvia	Latvia	
 Europe	Latvia	Riga	
 Europe	Lithuania	Lithuania	
@@ -1168,8 +1195,8 @@ Europe	Luxembourg	Luxembourg
 Europe	Moldova	Balti	
 Europe	Moldova	Cahul	
 Europe	Moldova	Chisinau	
-Europe	Moldova	Rezina	
 Europe	Moldova	Rezina	Rabnita
+Europe	Moldova	Rezina	
 Europe	Moldova	Soroca	
 Europe	Moldova	Straseni	
 Europe	Montenegro	Montenegro	
@@ -1317,12 +1344,12 @@ Europe	Russia	Tatarstan
 Europe	Russia	Tver Region	
 Europe	Russia	Yamalo-Nenets Autonomous Okrug	
 Europe	Russia	Yaroslavl Oblast	
-Europe	Serbia	Serbia	
 Europe	Serbia	Cacak	
 Europe	Serbia	Kraljevo	
 Europe	Serbia	Novi Pazar	
 Europe	Serbia	Novi Sad	
 Europe	Serbia	Serbia	
+Europe	Serbia	Serbia	
 Europe	Serbia	Uzice	
 Europe	Slovakia	Bratislava	
 Europe	Slovakia	Kosice	
@@ -1669,19 +1696,16 @@ North America	Canada	Newfoundland and Labrador
 North America	Canada	Nova Scotia	
 North America	Canada	Ontario	Toronto
 North America	Canada	Ontario	
-North America	Canada	Quebec	
-<<<<<<< HEAD
 North America	Canada	Quebec	Lanaudière
 North America	Canada	Quebec	Montérégie
-North America	Costa Rica	Alajuela	
-=======
->>>>>>> 4fde2e5... Automated commit: clean manually maintained tsvs
+North America	Canada	Quebec	
 North America	Costa Rica	Alajuela	Alajuela
 North America	Costa Rica	Alajuela	Grecia
 North America	Costa Rica	Alajuela	Orotina
 North America	Costa Rica	Alajuela	San Carlos
 North America	Costa Rica	Alajuela	San Rafael de Alajuela
 North America	Costa Rica	Alajuela	
+North America	Costa Rica	Alajuela	
 North America	Costa Rica	Cartago CR	La Union
 North America	Costa Rica	Cartago CR	
 North America	Costa Rica	Costa Rica	
@@ -1806,8 +1830,8 @@ North America	USA	California	Alameda County
 North America	USA	California	Contra Costa County
 North America	USA	California	Davis
 North America	USA	California	Fresno County
-North America	USA	California	Grand Princess Cruise Ship
 North America	USA	California	Grand Princess
+North America	USA	California	Grand Princess Cruise Ship
 North America	USA	California	Humboldt County
 North America	USA	California	Imperial County
 North America	USA	California	Kern County
@@ -1887,12 +1911,8 @@ North America	USA	Grand Princess
 North America	USA	Grand Princess 2nd cruise	Grand Princess Cruise Ship
 North America	USA	Grand Princess 2nd cruise	
 North America	USA	Hawaii	
-North America	USA	Idaho	
-<<<<<<< HEAD
 North America	USA	Idaho	Madison County
-North America	USA	Illinois	
-=======
->>>>>>> 4fde2e5... Automated commit: clean manually maintained tsvs
+North America	USA	Idaho	
 North America	USA	Illinois	Chicago
 North America	USA	Illinois	Cook County
 North America	USA	Illinois	Dupage County
@@ -1904,6 +1924,7 @@ North America	USA	Illinois	Ogle County
 North America	USA	Illinois	Stephenson County
 North America	USA	Illinois	Winnebago County IL
 North America	USA	Illinois	
+North America	USA	Illinois	
 North America	USA	Indiana	Indianapolis
 North America	USA	Indiana	
 North America	USA	Iowa	Allamakee County
@@ -2010,16 +2031,13 @@ North America	USA	Oregon	Sherman County
 North America	USA	Oregon	Umatilla County
 North America	USA	Oregon	Wasco County
 North America	USA	Oregon	Washington County OR
-<<<<<<< HEAD
 North America	USA	Oregon	Yamhill County
-North America	USA	Pennsylvania	
-=======
 North America	USA	Oregon	
->>>>>>> 4fde2e5... Automated commit: clean manually maintained tsvs
 North America	USA	Pennsylvania	Allegheny County
 North America	USA	Pennsylvania	Montgomery County PA
 North America	USA	Pennsylvania	Pittsburgh
 North America	USA	Pennsylvania	
+North America	USA	Pennsylvania	
 North America	USA	Puerto Rico	Ponce
 North America	USA	Puerto Rico	
 North America	USA	Rhode Island	
@@ -2031,15 +2049,12 @@ North America	USA	South Carolina
 North America	USA	South Dakota	Minnehaha County
 North America	USA	South Dakota	
 North America	USA	Tennessee	
-<<<<<<< HEAD
-North America	USA	Texas	
 North America	USA	Texas	Bexar County
-=======
->>>>>>> 4fde2e5... Automated commit: clean manually maintained tsvs
 North America	USA	Texas	Greater Houston Area
 North America	USA	Texas	Houston
 North America	USA	Texas	Panola County
 North America	USA	Texas	
+North America	USA	Texas	
 North America	USA	USA	
 North America	USA	Utah	
 North America	USA	Vermont	
@@ -2135,14 +2150,11 @@ Oceania	Australia	Queensland	Southeast Queensland
 Oceania	Australia	Queensland	Sunshine Coast
 Oceania	Australia	Queensland	
 Oceania	Australia	South Australia	
-<<<<<<< HEAD
 Oceania	Australia	Tasmania	
-Oceania	Australia	Victoria	
-=======
->>>>>>> 4fde2e5... Automated commit: clean manually maintained tsvs
 Oceania	Australia	Victoria	Clayton AU
 Oceania	Australia	Victoria	Melbourne
 Oceania	Australia	Victoria	
+Oceania	Australia	Victoria	
 Oceania	Australia	Western Australia	Perth
 Oceania	Australia	Western Australia	
 Oceania	Guam	Guam	
@@ -2190,13 +2202,10 @@ South America	Brazil	Maranhão
 South America	Brazil	Mato Grosso	
 South America	Brazil	Minas Gerais	
 South America	Brazil	Para	
-<<<<<<< HEAD
 South America	Brazil	Paraiba	
-South America	Brazil	Paraná	
-=======
->>>>>>> 4fde2e5... Automated commit: clean manually maintained tsvs
 South America	Brazil	Paraná	Curitiba
 South America	Brazil	Paraná	
+South America	Brazil	Paraná	
 South America	Brazil	Pernambuco	Alianca
 South America	Brazil	Pernambuco	Camaragibe
 South America	Brazil	Pernambuco	Caruaru
@@ -2357,17 +2366,14 @@ South America	Ecuador	Guayas	Guayaquil
 South America	Ecuador	Guayas	San Jacinto de Yaguachi
 South America	Ecuador	Guayas	
 South America	Ecuador	Imbabura	Ibarra
-South America	Ecuador	Imbabura	Urcuqui
-<<<<<<< HEAD
 South America	Ecuador	Imbabura	Otavalo
-South America	Ecuador	Los Rios	
-=======
+South America	Ecuador	Imbabura	Urcuqui
 South America	Ecuador	Imbabura	
->>>>>>> 4fde2e5... Automated commit: clean manually maintained tsvs
 South America	Ecuador	Los Rios	Babahoyo
 South America	Ecuador	Los Rios	Quevedo
 South America	Ecuador	Los Rios	Ventanas
 South America	Ecuador	Los Rios	
+South America	Ecuador	Los Rios	
 South America	Ecuador	Manabi	Calceta
 South America	Ecuador	Manabi	Jipijapa
 South America	Ecuador	Manabi	Manta
@@ -2377,25 +2383,19 @@ South America	Ecuador	Manabi	Puerto Lopez
 South America	Ecuador	Manabi	Sucre
 South America	Ecuador	Manabi	
 South America	Ecuador	Orellana	Coca
-<<<<<<< HEAD
 South America	Ecuador	Orellana	Orellana
-South America	Ecuador	Pichincha	
-=======
 South America	Ecuador	Orellana	
->>>>>>> 4fde2e5... Automated commit: clean manually maintained tsvs
 South America	Ecuador	Pichincha	Cayambe
 South America	Ecuador	Pichincha	Quito
 South America	Ecuador	Pichincha	
+South America	Ecuador	Pichincha	
 South America	Ecuador	Santa Elena	
-<<<<<<< HEAD
-South America	Ecuador	Zamora-Chinchipe	
 South America	Ecuador	Zamora-Chinchipe	El-Pangui
 South America	Ecuador	Zamora-Chinchipe	Yantzaza
-South America	Ecuador	Zamora-Chinchipe	Zamora
-=======
 South America	Ecuador	Zamora-Chinchipe	Yantzaza
+South America	Ecuador	Zamora-Chinchipe	Zamora
+South America	Ecuador	Zamora-Chinchipe	
 South America	Ecuador	Zamora-Chinchipe	
->>>>>>> 4fde2e5... Automated commit: clean manually maintained tsvs
 South America	Peru	Ancash	
 South America	Peru	Arequipa	
 South America	Peru	Cajamarca