Fixed another urls.py merge conflict