create new branch
AND simple
commit by master
conflict fixed
Branch Mange