conflict resolution

Author: rda3mon

hbase-backup/src/test/java/org/apache/hadoop/hbase/backup/TestBackupBase.java

@@ -124,7 +124,7 @@ public void ensurePreviousBackupTestsAreCleanedUp() throws Exception {
       // some often being no-ops. the goal is to help ensure atomicity
       // of that tests that implement TestBackupBase
       try (BackupAdmin backupAdmin = getBackupAdmin()) {
-        backupManager.finishBackupSession();
+        backupManager.finishBackupSession(backupId);
         backupAdmin.listBackupSets().forEach(backupSet -> {
           try {
             backupAdmin.deleteBackupSet(backupSet.getName());