resolution [noun] + conflict [noun]