Fix conflict in index page