Finish hand-merge