windows conflict
Revert "windows conflict"

This reverts commit 815c66de6e4106568e752101911956624df5d88c.