Rework merging.