[JBTM-1453] Fix merge error