some tweeks
merge resolution