fix merge errors about string formatting