fixing page layout
fix merge conflict