resolve conflicts

6 jobs for feature/azure-provider-implementation in 6 minutes and 54 seconds (queued for 4 seconds)