small fixes
fixed conflicts
fixed conflicts