Resolve merge conflicts

Author: ArunSahadeo

.editorconfig

@@ -31,6 +31,11 @@ indent_size = 4
 indent_style = space
 indent_size = 2
 
+# D
+[*.d]
+indent_style = space
+indent_size = 4
+
 # Elm
 [*.elm]
 indent_style = space
@@ -50,6 +55,11 @@ indent_size = 2
 indent_style = space
 indent_size = 2
 
+# Java
+[*.java]
+indent_style = space
+indent_size = 4
+
 # Julia
 [*.jl]
 indent_style = space
@@ -60,6 +70,16 @@ indent_size = 4
 indent_style = space
 indent_size = 2
 
+# JSON
+[*.json]
+indent_style = space
+indent_size = 2
+
+# Matlab
+[*.m]
+indent_style = space
+indent_size = 4
+
 # Markdown
 [*.md]
 indent_style = space
@@ -75,6 +95,11 @@ indent_size = 2
 indent_style = space
 indent_size = 4
 
+# Racket
+[*.rkt]
+indent_style = space
+indent_size = 2
+
 # Rust
 [*.rs]
 indent_style = space