mocha updated
conflicts resolved