resolve conflicts

13 jobs for azure-m14-candidate in 9 minutes and 55 seconds (queued for 2 seconds)