said hi
fixed conflicts