Fix merge snafu