Merge conflict resolution

Signed-off-by: Harsh Kothari <[email protected]>

Author: Harsh Kothari

server/src/main/java/org/opensearch/index/IndexSettings.java

@@ -788,7 +788,8 @@ public static IndexMergePolicy fromString(String text) {
         true,
         Property.Dynamic,
         Property.IndexScope
-      
+    );
+
     public static final Setting<Boolean> INDEX_DERIVED_SOURCE_SETTING = Setting.boolSetting(
         "index.derived_source.enabled",
         false,