users
users and fix merge