Fix conflicts

application/src/main/java/org/thingsboard/server/service/install/SqlDatabaseUpgradeService.java

@@ -214,6 +214,10 @@ public class SqlDatabaseUpgradeService implements DatabaseEntitiesUpgradeService
                         conn.createStatement().execute("ALTER TABLE attribute_kv ADD COLUMN json_v json;");
                     } catch (Exception e) {
                     }
+                    try {
+                        conn.createStatement().execute("ALTER TABLE dashboard ALTER COLUMN configuration SET DATA TYPE varchar(100000000);"); //NOSONAR, ignoring because method used to execute thingsboard database upgrade script
+                    } catch (Exception e) {
+                    }
                     log.info("Schema updated.");
                 }
                 break;

dao/src/main/resources/sql/schema-entities.sql

@@ -108,7 +108,7 @@ CREATE TABLE IF NOT EXISTS customer (
 
 CREATE TABLE IF NOT EXISTS dashboard (
     id varchar(31) NOT NULL CONSTRAINT dashboard_pkey PRIMARY KEY,
-    configuration varchar(10000000),
+    configuration varchar(100000000),
     assigned_customers varchar(1000000),
     search_text varchar(255),
     tenant_id varchar(31),