Fix invalid merge