Feature/erb templates2

resolve merge conflicts