resolved urls.py conflicts
merged with remot