fix the conflict
Merge branch 'master' of https://github.com/ihepburn/cygwin_config into 5e19a88