Fix conflict in api/views.py