Merging Unix changes with Win