fix conflict vs inconsistency language