Added UserInfo class with a foreignkey entity to UserProfile
Resolved conflicts