Allow merges with another branch