commit first change in the branch demo1
commit second change in the branch demo1
Merge branch 'master' into demo1

Conflicts:
	test.txt
Merge branch 'master' into demo1

Conflicts:
	test.txt
Merge branch 'master' into demo1