small changes
fixed conflicts