small change to winmain
fixed merge conflict