Merging the branches