resolve merge conflicts from user/show