bug fix simulation
fixed conflict