Header country icon fix
Header country and world conflict