fix template afte wrong merge