fix typro on windows platform when conflict merge