merge dev , handle conflict

3 jobs for master in 15 minutes and 16 seconds (queued for 1 second)
Status Name Job ID Coverage
  Build
passed singularity-image #82544

00:14:14

failed singularity-image #82540

00:00:06

 
  Deploy
passed deploy #82541

00:01:01