Correct merge failures