add a new branch
new branch for new feature
conflict occur
conflict resolved
add new branch to merge
merge with no-ff
new branch to merge