branch test
new branch feature1
add one line conflic with branch feature1
conflic fixed
add merge
merge with no-ff
fix issue 101
merged bug fix 101