Really fixed conflicts