auto merge messed up the views.py so reverted some code before my initial commit