updates
fixed conflicts