From 1b36f79a4ec7d4537fe8577348ef971bf324c773 Mon Sep 17 00:00:00 2001
From: Anagh Hegde <anagh@appsmith.com>
Date: Wed, 16 Jun 2021 13:44:46 +0530
Subject: [PATCH] Fix merge conficts

---
 .../java/com/appsmith/server/migrations/DatabaseChangelog.java  | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/server/appsmith-server/src/main/java/com/appsmith/server/migrations/DatabaseChangelog.java b/app/server/appsmith-server/src/main/java/com/appsmith/server/migrations/DatabaseChangelog.java
index bc55f6a8b4..c2e965be5c 100644
--- a/app/server/appsmith-server/src/main/java/com/appsmith/server/migrations/DatabaseChangelog.java
+++ b/app/server/appsmith-server/src/main/java/com/appsmith/server/migrations/DatabaseChangelog.java
@@ -2368,7 +2368,7 @@ public class DatabaseChangelog {
      * created pages of all the application present.
      * - []
      */
-    @ChangeSet(order = "071", id = "add-and-update-order-for-all-pages", author = "")
+    @ChangeSet(order = "072", id = "add-and-update-order-for-all-pages", author = "")
     public void addOrderToAllPagesOfApplication(MongoTemplate mongoTemplate) {
         for (Application application : mongoTemplate.findAll(Application.class)) {
             if(application.getPages() != null) {