add getUserInfo
solving conflicts again
solving conflicts