took out changes in seeds.rb
fixed merge conflicts?