confict resolved