Missed one if test in the merge conflict handling

Status Job ID Name Coverage
  Packages
passed packages_deb10 #35439
build

01:29:58

passed packages_deb9 #35438
build

01:11:45

passed packages_el6 #35435
build

00:38:32

passed packages_el7 #35436
build

01:12:45

passed packages_el8 #35437
build

00:52:46

passed packages_ubuntu1804 #35440
build

01:05:23

 
  Deploy And Test
passed deploy_staging_deb10 #35445
deploy 158.39.201.179

00:07:04

passed deploy_staging_deb9 #35444
deploy 158.37.63.83

00:07:07

passed deploy_staging_el6 #35441
deploy 158.39.74.3

00:06:36

passed deploy_staging_el7 #35442
deploy 158.39.75.5

00:08:30

passed deploy_staging_el8 #35443
deploy 158.39.201.67

00:06:47

passed deploy_staging_ubuntu1804 #35446
deploy 158.39.74.3

00:07:57