Update views.py

merge conflict removed