conf test
fixed conflicts
fixed conf