switched to ejs
switch to ejs
resolve conflicts