seeder: tidy up merge conflicts
whitespace: death by reindentation