added tiles
updated tiles into json
merged