Fixed up a merge snafu