added intro
merge