deleting conflicts