small tweaks
fixed conflicts