Pushing fixed conflicts