Fixed merge snafu