making conflicts
fixed conflicts