I agree on the merge.
BTW I didn't want (for now) allow the user to chose its countries.