fixing friend show merge code