good
branch
conflict
right
solve conflict
commit
all
solve