views.py merge