updated docker containers
merge conflict