clear out conflicts