add login to user, slugged it
conflict in gemfile.lock