fixed an error with user_spec, tests green
fix merge conflict