Post merge build fix

Author: gmarz

src/Nest/IndexModules/IndexSettings/Settings/IndexSettingsConverter.cs

@@ -74,17 +74,6 @@ public override void WriteJson(JsonWriter writer, object value, JsonSerializer s
 			d[UpdatableIndexSettings.SlowlogIndexingLevel] = indexing?.LogLevel;
 			d[UpdatableIndexSettings.SlowlogIndexingSource] = indexing?.Source;
 
-<<<<<<< HEAD
-			var indexSettings = value as IIndexSettings;
-			if (indexSettings != null)
-			{
-				d["index.number_of_shards"] = indexSettings?.NumberOfShards;
-				d[UpdatableIndexSettings.StoreType] = indexSettings?.FileSystemStorageImplementation;
-			}
-			d["index.queries.cache.enabled"] = indexSettings?.Queries?.Cache?.Enabled;
-
-=======
->>>>>>> d3cd40c... fix #2602 typed routing partition size on index settings (#2623)
 			d[UpdatableIndexSettings.Analysis] = ds.Analysis;
 
 			var indexSettings = value as IIndexSettings;
@@ -102,7 +91,7 @@ public JObject Flatten(JObject original, string prefix = "", JObject newObject =
 			newObject = newObject ?? new JObject();
 			foreach (var property in original.Properties())
 			{
-				if (property.Value is JObject && property.Name != UpdatableIndexSettings.Analysis)
+				if (property.Value is JObject && property.Name != UpdatableIndexSettings.Analysis)
 					Flatten(property.Value.Value<JObject>(), prefix + property.Name + ".", newObject);
 				else newObject.Add(prefix + property.Name, property.Value);
 			}
@@ -132,7 +121,7 @@ private void SetKnownIndexSettings(JsonReader reader, JsonSerializer serializer,
 			Set<bool?>(s, settings, UpdatableIndexSettings.BlocksMetadata, v => s.BlocksMetadata = v);
 			Set<int?>(s, settings, UpdatableIndexSettings.Priority, v => s.Priority = v);
 			Set<Union<int, RecoveryInitialShards>>(s, settings, UpdatableIndexSettings.RecoveryInitialShards,
-				v => s.RecoveryInitialShards = v);
+				v => s.RecoveryInitialShards = v);
 			Set<bool?>(s, settings, UpdatableIndexSettings.RequestsCacheEnable, v => s.RequestsCacheEnabled = v);
 			Set<int?>(s, settings, UpdatableIndexSettings.RoutingAllocationTotalShardsPerNode,
 				v => s.RoutingAllocationTotalShardsPerNode = v);
@@ -146,7 +135,7 @@ private void SetKnownIndexSettings(JsonReader reader, JsonSerializer serializer,
 			var tf = s.Translog.Flush = new TranslogFlushSettings();
 			Set<string>(s, settings, UpdatableIndexSettings.TranslogFlushThresholdSize, v => tf.ThresholdSize = v);
 			Set<Time>(s, settings, UpdatableIndexSettings.TranslogFlushThresholdPeriod, v => tf.ThresholdPeriod = v);
-
+
 			s.Merge = new MergeSettings();
 			var p = s.Merge.Policy = new MergePolicySettings();
 			Set<int?>(s, settings, UpdatableIndexSettings.MergePolicyExpungeDeletesAllowed, v => p.ExpungeDeletesAllowed = v);
@@ -218,8 +207,8 @@ private static void Set<T>(IIndexSettings s, IDictionary<string, JProperty> sett
 			var v = settings[key];
 			T value = serializer == null ? v.Value.ToObject<T>() : v.Value.ToObject<T>(serializer);
 			assign(value);
-			s.Add(key, value);
+			s.Add(key, value);
 			settings.Remove(key);
 		}
 	}
-}
+}