Merge b2g-inbound to m-c. a=merge