New town and map tiles
Merging conflicts