fixed mem desc for mobile
fixed merge conflict