Corrected a merge snafu