add conflict clauses