confluct resolved