removed marco from title
fixed merge conflict on index.html