Fixed final merge dependencies and data seeding