fixed conflict

2 jobs for mergetests in 35 minutes and 14 seconds (queued for 1 second)
latest
Status Name Job ID Coverage
  Windows
passed BranchJobWindows #202991
Windows10

00:17:13

passed masterJobWindows #202990
Windows10

00:18:00