brach test
add a line for f1
add a line for master
conflict fixed
add merge
merge with no--ff
fix buf 101
merged bug fix 101