small tweaks
small merge conflict