Merge a la main