Adding Tomahawk and it's paltry population again again
Resoling conflicts with a message