update and merge with version from Windows machine