conflitro resolution