nana
merge issue in user.rb