Resolved merge conflict.

acceptance/python/Dockerfile

@@ -1,9 +1,10 @@
 FROM python:3.9
 
+RUN apt-get update && apt-get install -y vim zsh
 RUN mkdir -p /src
 RUN pip install --upgrade \
 	pycco \
 	websocket-client~=0.47.0 \
 	pytest~=3.0 \
-	bigchaindb-driver~=0.6.2 \
+	planetmint-driver>=0.9.0 \
 	blns