charge page
fix conflict