Users now have profile fields
fixed merge conflicts