Merge "API edit: allow ConfirmEdit to use the merged parse"