cleaned Dockerfile
add conduit integration
fix conflict