small sharing updates
fixed conflicts