update to m3
merge