Fixed Merge implementation