fix side page
fix conflict