From ecd07098512a0145f9e8414c9cad691eec6303cb Mon Sep 17 00:00:00 2001
From: Jan Eitzinger <jan.treibig@gmail.com>
Date: Wed, 12 Apr 2023 07:30:41 +0200
Subject: [PATCH] Fix more merge bugs

---
 pkg/archive/fsBackend.go | 4 +---
 test/integration_test.go | 1 -
 2 files changed, 1 insertion(+), 4 deletions(-)

diff --git a/pkg/archive/fsBackend.go b/pkg/archive/fsBackend.go
index 76e8d47..847152b 100644
--- a/pkg/archive/fsBackend.go
+++ b/pkg/archive/fsBackend.go
@@ -341,8 +341,6 @@ func (fsa *FsArchive) ImportJob(
 	}
 	if err := f.Close(); err != nil {
 		log.Warn("Error while closing data.json file")
-		return err
-
 	}
-	return f.Close()
+	return err
 }
diff --git a/test/integration_test.go b/test/integration_test.go
index 60d2e90..f6c52c0 100644
--- a/test/integration_test.go
+++ b/test/integration_test.go
@@ -494,7 +494,6 @@ func TestRestApi(t *testing.T) {
 	}
 
 	const stopJobBody string = `{
-        "jobId":     123,
         "jobId":     123,
 		"startTime": 123456789,
 		"cluster":   "testcluster",