resolved merge conflicts

4 jobs from master in 12 seconds (queued for 2 seconds)
Status Job ID Name Coverage
  Build Dashboards
passed #8491
ci
build_dashboards_job

00:00:04

 
  Deploy Dashboards
passed #8492
cd
deploy_dashboards_job

00:00:03

 
  Build Alerts
passed #8493
ci
build_alerts_job

00:00:02

 
  Deploy Alerts
passed #8494
cd
deploy_alerts_job

00:00:01