fixed conflicts with schema