intro page update
merge conflicts
merge conflicts