AND simple
& simple
conflict fixed
add oneline text
resolve conflict
add merge
merge with no-ff again
resolve bug on issue-101
merged bug fix 101