fixed conflicts

4 jobs for GONRG-2933 in 29 seconds (queued for 2 seconds)
Status Name Job ID Coverage
  Scripts Check
passed bash_check #474704

00:00:15

passed md_link-check #474701

00:00:27

passed md_structure-check #474702

00:00:17

passed python_check #474703

00:00:27