Creating template
resolve merge
fixing OpenShift merge
fixed disconnection problem