showing users in different lists
fixed merge conflict