fixed user class
merge
merge