Fixed merging