Fix merge failure.