resolving confl