Creating template
fixing OpenShift merge
FIX OpenShift merge