Resolving conflicts, when working with portfolios