Update to allow specifying a single version to merge
Use patchId to figure out if we need to record the merge or not