fixed seeding problem (possible azure failure problem)
resolved conflicts