resolved merge error in userInfo