Optimized

Merging