update group page
merge conflict fixed