Resolves mergeconflict in test1.txt during rebase of demo1 to master
Merge branch 'demo1'