tweaks
resolved conflicts