Added weather tile
fixed merge conflict