Add User List function.
Resolve conflicts