Fixed a merge conflict in opendsa/views.py