settings change
fixed conflicts