files sync on liupeng's windows
merging files on liupeng's windows