deleted runallsims
resolve conflicts