merge issue fix for windows