merge
fix concept userMapToUser()
merge