Rework on the MergeContext