build of simulator
fixed conflicts