Fix merge conflicts in index page