fixed conflicts dialog