finished image template
fixed merge conf