testing upmerge on windows