fix

Author: lucasmcdonald3

test_vector_handlers/tox.ini

@@ -50,11 +50,7 @@ sitepackages = False
 deps =
     -rtest/requirements.txt
     # Install the MPL requirements if the `-mpl` suffix is present
-<<<<<<< HEAD
     mpl: -rrequirements_mpl.txt
-=======
-    mpl: -r../requirements_mpl.txt
->>>>>>> mpl-reviewed
     ..
 commands = 
     awses_local: {[testenv:base-command]commands}