COnflict resolved