fixed merge conflicts

Status Job ID Name Coverage
  Windows
failed #389891
Windows10
masterJobWindows

 
  Linux
skipped #389892
BranchJobLinux
 
Name Stage Failure
failed
masterJobWindows Windows There has been a timeout failure or the job got stuck. Check your timeout limits or try again
No job trace