added docker
fixed merge conflicts