added in a confict
resolved conflicts