added win project
resolved conflicts
fixed