[Truffle] Fix bad merge.