merge snafu fixes