changed file1 for branch1
change 2 for branch 1
file2 modified for master 2
Merge branch 'branch1'
after first merge file2