Fix for broken-ness on Windows
Update merge