Fixed a merge conflict in the views.py file.