modify f1 in new2
modify f1 in new2 branch
add f2 in new2 branch
merge with --no-ff from branch new2