support Intro tags
merge conflicts