[Truffle] Fix merge.