solved merge conflict

2 jobs for develop
Status Name Job ID Coverage
  Windows
failed masterJobWindows #697663
Windows10

 
  Linux
skipped BranchJobLinux #697664
 
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 log