[GAIA] - :crying_cat_face: restore merging logic