revised user/show merge conflicts