Better item merging