first commit
initial config
updated template insertion
fixed merge