added in a confict