fix bad merge for [#TIMOB-11794]

fix bad merge for [#TIMOB-11794]