add fields to User
devise views
merge mofo