Fixing the terrors of branch merging