correct invalid merge