Fix merging into release branch when in a hotfix