solved some conflicts

4 jobs for diarization in 57 minutes and 8 seconds (queued for 3 seconds)
latest
Status Job ID Name Coverage
  Build
failed #126172
docker
build_linux_27

00:22:16

63.0%
failed #126173
docker
build_linux_36

00:22:16

63.0%
failed #126174
macosx
build_macosx_27

00:30:56

63.0%
failed #126175
macosx
build_macosx_36

00:28:40

63.0%
 
Name Stage Failure
failed
build_macosx_36 Build There is an unknown failure, please try again
(19:17:54.170) export CURL_CA_BUNDLE=/Users/buildbot/work/gitlab/f6f95b82/0/bob/bob.bio.gmm/_ci/cacert.pem
(19:17:54.179)
export SSL_CERT_FILE=/Users/buildbot/work/gitlab/f6f95b82/0/bob/bob.bio.gmm/_ci/cacert.pem
(19:17:54.188)
export GIT_SSL_CAINFO=/Users/buildbot/work/gitlab/f6f95b82/0/bob/bob.bio.gmm/_ci/cacert.pem
(19:17:54.199)
export DOC_SERVER_PREFIX=public-upload/docs/bob/bob.bio.gmm
(19:17:54.212)
DOC_UPLOADS=public-upload/docs/bob/bob.bio.gmm/diarization/
(19:17:54.227)
export LANG=en_US.UTF-8
(19:17:54.241)
export LC_ALL=en_US.UTF-8
(19:17:54.254)
export MATPLOTLIBRC=/Users/buildbot/work/gitlab/f6f95b82/0/bob/bob.bio.gmm/_ci
ERROR: Job failed: exit status 1
failed
build_macosx_27 Build There is an unknown failure, please try again
(19:02:15.557) export CURL_CA_BUNDLE=/Users/buildbot/work/gitlab/f6f95b82/2/bob/bob.bio.gmm/_ci/cacert.pem
(19:02:15.567)
export SSL_CERT_FILE=/Users/buildbot/work/gitlab/f6f95b82/2/bob/bob.bio.gmm/_ci/cacert.pem
(19:02:15.575)
export GIT_SSL_CAINFO=/Users/buildbot/work/gitlab/f6f95b82/2/bob/bob.bio.gmm/_ci/cacert.pem
(19:02:15.585)
export DOC_SERVER_PREFIX=public-upload/docs/bob/bob.bio.gmm
(19:02:15.594)
DOC_UPLOADS=public-upload/docs/bob/bob.bio.gmm/diarization/
(19:02:15.605)
export LANG=en_US.UTF-8
(19:02:15.615)
export LC_ALL=en_US.UTF-8
(19:02:15.626)
export MATPLOTLIBRC=/Users/buildbot/work/gitlab/f6f95b82/2/bob/bob.bio.gmm/_ci
ERROR: Job failed: exit status 1
failed
build_linux_36 Build There is an unknown failure, please try again
(17:43:31.028) export CURL_CA_BUNDLE=/local/builds/bob/bob.bio.gmm/_ci/cacert.pem
(17:43:31.029)
export SSL_CERT_FILE=/local/builds/bob/bob.bio.gmm/_ci/cacert.pem
(17:43:31.031)
export GIT_SSL_CAINFO=/local/builds/bob/bob.bio.gmm/_ci/cacert.pem
(17:43:31.032)
export DOC_SERVER_PREFIX=public-upload/docs/bob/bob.bio.gmm
(17:43:31.033)
DOC_UPLOADS=public-upload/docs/bob/bob.bio.gmm/diarization/
(17:43:31.034)
export LANG=en_US.UTF-8
(17:43:31.035)
export LC_ALL=en_US.UTF-8
(17:43:31.036)
export MATPLOTLIBRC=/local/builds/bob/bob.bio.gmm/_ci
ERROR: Job failed: exit code 1
failed
build_linux_27 Build There is an unknown failure, please try again
(17:43:35.477) export CURL_CA_BUNDLE=/local/builds/bob/bob.bio.gmm/_ci/cacert.pem
(17:43:35.479)
export SSL_CERT_FILE=/local/builds/bob/bob.bio.gmm/_ci/cacert.pem
(17:43:35.480)
export GIT_SSL_CAINFO=/local/builds/bob/bob.bio.gmm/_ci/cacert.pem
(17:43:35.481)
export DOC_SERVER_PREFIX=public-upload/docs/bob/bob.bio.gmm
(17:43:35.482)
DOC_UPLOADS=public-upload/docs/bob/bob.bio.gmm/diarization/
(17:43:35.483)
export LANG=en_US.UTF-8
(17:43:35.484)
export LC_ALL=en_US.UTF-8
(17:43:35.485)
export MATPLOTLIBRC=/local/builds/bob/bob.bio.gmm/_ci
ERROR: Job failed: exit code 1