Merge release branch