updating with mapped vol and making run command easier to read
resolving conflicts