Fix merge failure

No match.