memorize fix
merge