Resolved conflict

src/main/resources/db/changelog/db.changelog-1.0.0.xml

@@ -3220,4 +3220,7 @@
         </addColumn>
         <dropNotNullConstraint tableName="company_document" columnName="user_with_company_id" columnDataType="INTEGER"/>
     </changeSet>
+    <changeSet id="25-03-2026_NK_170536" author="Rajesh Khore">
+        <sqlFile dbms="postgresql" path="db/dump/insert_form_field_25_03_2026.sql"/>
+    </changeSet>
 </databaseChangeLog>

src/main/resources/db/dump/insert_form_field_25_03_2026.sql

@@ -0,0 +1,12 @@
+INSERT INTO FORM_FIELD (SORT_ORDER, NAME, LABEL, DESCRIPTION, SETTINGS, VALIDATORS, CREATED_DATE, UPDATED_DATE)
+VALUES
+(
+    24,
+    'spreadsheet',
+    'Foglio di Calcolo',
+    'Modello di foglio di calcolo con variabili dinamiche',
+    '[{name: "label",value: "Foglio di Calcolo"},{name: "template",value: {}}]',
+    '{}',
+    CURRENT_TIMESTAMP,
+    CURRENT_TIMESTAMP
+);