commit by branch-2
Merge branch 'Branch2'
Merge branch 'Branch1'

Conflicts:
	filesample.txt
Merge branch 'Branch1' into Branch2
r
Merge branch 'Branch1'
asd
Merge branch 'Branch2'

Conflicts:
	filesample.txt
Merge branch 'master' into Branch1