Updates to UserProfile
resolve merge conflict