Finish writing seeds.rb
Fix merge conflict