merge openshift