new branch is added
conflict
new change on master
conflict is fixted