Fix merge SNAFU