merge latest omni source