some manual merging