minor changes
fixed conflicts