tweaks
fixed conflict