Added basic manual merging.