Fix merge snafu.