/portal/urls.py: Merge conflict solved