Added chairs to ferris wheel.
Fixed merge issue