fixes small merge conflict in user/api/core.py