changes to seed file
fixed conflict