"fixed conflicts"