Fix merge snafu.
mend