added: merging for OpenShift