merged views.py