Updated index.ejs
Fixed merge conflicts