converHeight in user model
merge conflicts