fixed more merge commits

src/main/java/de/uulm/omi/dbms/workload/api/impl/WorkloadApiServiceImpl.java

@@ -45,17 +45,7 @@ public class WorkloadApiServiceImpl extends WorkloadApiService {
   //TPC-C constants
   private final String TPCC_RESULT_FOLDER = "TPCC/";
   private static final String TPCC_BINARY = "./cockroach";
-
-
-<<<<<<< HEAD
-  //TSBS constants
-  private final String TSBS_RESULT_FOLDER = "TSBS/";
-  private static final String TSBS_BINARY = "/opt/workloads/tsbs/bin/";
-  private static final String TSBS_SCRIPTS = "/opt/workloads/tsbs/src/omi-gitlab.e-technik.uni-ulm.de/mowgli/benchmarks/mowgli-tsbs/scripts/";
-
-
-=======
->>>>>>> 1f37d36184567e516e0854bf1dd0cf0073592d05
+  
 
   @Override
   public Response workloadResultGet(@NotNull String taskId, @NotNull String workloadType,