More manual merging