Correct invalid merge