fix mem
merge