Fix malformed merge