COMP: fix conflicts

16 jobs for !808 with 2160-SarSensorModel in 4 minutes and 31 seconds (queued for 2 seconds)
detached
Status Job ID Name Coverage
  Precheck
canceled #40699
fast-build

00:04:31

canceled #40700
allowed to fail
legal-check

00:04:31

 
  Prepare
canceled #40702
centos-xdk-prepare

canceled #40703
macos
macos-xdk-prepare

canceled #40701
ubuntu-xdk-prepare

canceled #40704
windows10
windows-10-prepare

canceled #40705
windows8
windows-8-prepare

 
  Build
canceled #40708
centos-xdk-build

canceled #40706
allowed to fail
debian-build

canceled #40709
macos
macos-xdk-build

canceled #40707
ubuntu-xdk-build-doc

canceled #40712
ubuntu-xdk-qa-code-coverage

canceled #40713
ubuntu-xdk-qa-static-analysis

canceled #40710
windows10
windows-10-build

canceled #40711
windows8
windows-8-build

 
  Report
canceled #40714
ubuntu-xdk-report