update pages and status
fix merge conflict