working on users
fix merge yo