Trying to fix OpenShift

There are conflicts on the server....