small tweaks
merge resolution