template
fixed merge