fix Merge