add a branch test.
add a text in feature1.
add a text in feature2.
insert a text in master.
resolve conflict fixed
fixed feature2 conflict
add merge
merge with no-ff