Manual merging