Sim fixed conflicts