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/request/FormFieldRequest.java

@@ -10,6 +10,10 @@ public class FormFieldRequest {
 
     private String name;
 
+    private String description;
+
+    private Integer sortOrder;
+
     private String label;
 
     private List<SettingRequestBean> settings;