more text in the intro
resolve merge conflict