Fixed the seed file and the index method in the controller and index view
merged conflict in index view