add user exists check
fix merge conflicts