Resolve Conflist