mac merge
merge conflict fix
optimized rmsm for mem access