fixing OpenShift merge