Conflicts only include rows which did not apply because of an error.

• 冲突仅包括因错误而未应用的行。