minor cleanup
fixed conflicts