Fix merge breakage.
9 files changed