Update seeds.rb
Update schema.sql
Update boot.rb
fixing merge conflicts