resolve merge conflicts of eb48f49dd to oc-dev