fxing windows bug in compiler
resolved conflict