change in branch
change test2 in branch
add test3 in master
delete test2 test3
change in f1
change in master
conflict test