Fix: merge conflic /portal/views.py