Add kibana config template
fix merge conflict