fix conflits

1 job for 168-identificar-alunos-que-fizeram-provar in 4 minutes and 59 seconds (queued for 1 second)
latest
Status Job ID Name Coverage
  Test
failed #39138
regular ubuntu
django-tests

00:04:59

 
Name Stage Failure
failed
django-tests Test
  File "<frozen importlib._bootstrap>", line 969, in _find_and_load
File "<frozen importlib._bootstrap>", line 958, in _find_and_load_unlocked
File "<frozen importlib._bootstrap>", line 673, in _load_unlocked
File "<frozen importlib._bootstrap_external>", line 665, in exec_module
File "<frozen importlib._bootstrap>", line 222, in _call_with_frames_removed
File "/usr/local/lib/python3.5/dist-packages/guardian/admin.py", line 9, in <module>
from django.urls import reverse, path
ImportError: cannot import name 'path'
ERROR: Job failed: exit code 1