fix merge format