error handling for who page
resloved merge conflicts