fix recent merge snafu