add user index page
fix merge conflict