added ejs
merge