vistaportal fields conflicts resolved