Update views.py

Solve merge conflict.