add back in the /profile merging logic that was buried in friends