Correct merge problems