merging the branch