Fix Simulator
resolve conflict