ENH: Fix problem with non-mergeable branches

These would break the state of the repo.