[GAIA] - restore merging logic