fix page.current
fix merge conflicts