set correct firm number in simulation
fixed simulate conflict