merging the branches