api page
fix conflicts