final config
fixed conflicts