fix build for truffle
unexpected merge