Commit by master-1
commit by branch-2
commit branch-1 new data
Merge branch 'Branch2'
Merge branch 'Branch1'

Conflicts:
	filesample.txt