commit for test1.txt
commit for test2.txt
commit for test3.txt
commit for test4.txt
made other changes
changes to file test4.txt
made another change
changes in file test3.txt
Merge branch 'iss53'
made changes to file test1.txt
changes for iss54
Merge branch 'iss54'

Conflicts:
	test1.txt
commit changes for test1.txt
commit for test1.txt in branch master
conflict resolved
Merge branch 'testing'
commit test5.txt