new file2 in branch1
file for branch from master
merged branch 2
merged branch 1