Left a merge conflict marker in seeds.rb