errors, but not ok
Merge origin/master
changes on member.php