added description of degrees of inconsistency
resolved conflict