changes
fix conflict on pages/index
styling