modified text2 on branch demo2
change text on text2.txt branch demo1
manual merge conflict
more text on branch demo1