fixes
fix user/member merge