more manual merging