manual merging again...