moving to docker
fixing merge