update seed.rb
update seed.rb
fixed merge conflicts
create user