set up templates, statics
fixed merge