linux sync to windows
fix conflict