individual group page
fix merge conflict