update test3.txt
one more line in Master
one more line in f1
merge f1 and master
add one line in test3.txt
merge with no-ff
 add new line
merge with common
 test2.txt
 f1
 merge & fix test3.txt