create feature1 branch
add branch feature1 in master
resove conflict
add a line in test.txt
merger with no-ff
fix bug 101
merge fix bug 101