Update Seed.rb with User seeds and fix merge conflicts.