edits on members page
just merged conflicts