Merge conflict in urls.py
indents