modified tile id's
merged conflicts