Created seeds.rb file
resolved merge conflicts