newbranch conflict