Colour countries by population
Resolved merge conflict