chumma update
commit to test branch
second commit to test
commit to the master branch after test branch split
hotfix xyz
Merge branch 'test'

Conflicts:
	app2.txt
test commit for conflict
master commit for conflict
master commit for conflict
master commit for conflict
master commit for conflict
Merge branch 'test'