Confict resolved