fixed merge conflict on users factory