fixed conflicts . . . again