Creating template
Resolve conflict mergin github and openshift