working on template builder
fixed conflict
;