merged with newBranch