modified text2 on branch demo2
manual merge conflict