added users
fixed merge