conflict resolved
Sane cygwin environment

Signed-off-by: Prem Mallappa <pmallapp@broadcom.com>