COMP: fix conflicts

2 jobs for 2160-SarSensorModel in 25 minutes and 10 seconds (queued for 3 seconds)
latest
Status Job ID Name Coverage
  Precheck
passed #40698
fast-build

00:25:10

 
  External
passed cdash:ubuntu-18.04-fast