first commit
full country join and dedup
fix conflict