fixed intro
merge fix