Rework the MergeContext usage