fixed index page merge conflict
fix merge conflict?