added user to API
fix merge conflict