Merging the merges back into the branch