Conflicts resolved with seed data