Add Conflicts for teh same