resolved conflicts

src/main/java/net/gepafin/tendermanagement/model/request/FlowEdgesRequestBean.java

@@ -5,6 +5,8 @@ import lombok.Data;
 @Data
 public class FlowEdgesRequestBean {
 
+    private String id;
+
     private String source;
 
     private String target;

src/main/java/net/gepafin/tendermanagement/model/response/FlowEdgesResponseBean.java

@@ -6,7 +6,7 @@ import org.springframework.security.core.parameters.P;
 
 @Data
 public class FlowEdgesResponseBean {
-    private Long id;
+    private String id;
 
     private String source;