api and manager page
fix conflict