fixed indentation on views.py
fixed merging issue