Updates
fixed conflicts