latest changes
fixed conflicts