Testing World Map
Fixed merge conflicts