Added som new Docker containers
Fixed conflict