intro ready
merge fixed