update oapmc
merge