branch test.
feature 1
feature2
feature3
AND beautiful
& beautiful
conflict fixed
add merge
merge with no-ff
fix bug 101
merge bug fix 101