resolved conflict in uiopen