Forgot to merge changes.

tox.ini

@@ -87,8 +87,4 @@ commands =
     pydocstyle {toxinidir}/celery
 
 [testenv:isort-check]
-<<<<<<< HEAD
-commands = isort --project celery --diff --order-by-type -rc -c {toxinidir}/celery {toxinidir}/t
-=======
-commands = isort -j2 --diff --skip celery/utils/deprecated.py --project celery --order-by-type -rc -c {toxinidir}/celery {toxinidir}/t
->>>>>>> Run isort with two jobs to speed it up.
+commands = isort -j2 --skip celery/utils/deprecated.py --project celery --diff --order-by-type -rc -c {toxinidir}/celery {toxinidir}/t