Fixed merging feature