merged with merger, all countries added successfully
merge conflicts resolved