Improve merging