resolve-inner-conflict