merge two panel to panelSimulation
merge conflicts