Fixed merging special case