create a new branch
and simple
AND simple
coflict fixed
add merge
merge with no-ff