Even with a "nomerge" policy? If we can't make this work we should record the problem