resolving conflict in seed file