added WIN_PATH
fixed merge conflicts