delte branch
newBranch
solveMergeproblem