Windows nan fix and correct factory merge