fix merge formatting