ocp_merge fixes