Merge management