Resolve conflicts

src/Header.js

@@ -6,16 +6,16 @@
  * This functions creates the necessary objects and is run when they do not already exist
  */
 const CM = {
-	Backup: {},
-	Cache: {},
-	Config: {},
-	ConfigData: {},
-	Data: {},
-	Disp: {},
-	Footer: {},
-	Main: {},
-	Options: {},
-	Sim: {},
+    Backup: {},
+    Cache: {},
+    Config: {},
+    ConfigData: {},
+    Data: {},
+    Disp: {},
+    Footer: {},
+    Main: {},
+    Options: {},
+    Sim: {},
 	VersionMajor: '2.031',
 	VersionMinor: '3',
 };