new a branch feature
& simple
fixed last line
branch changed
merge with no-off
fix bug 101
fix bug-101
merged bug fix 101