fix merge conflagration