code merge + user profiles + my profile