diff --git a/extension.json b/extension.json
index 5394d5635..1e7bfe8ed 100644
--- a/extension.json
+++ b/extension.json
@@ -1,151 +1,144 @@
 {
 	"name": "TwoColConflict",
 	"version": "1.0.0",
 	"author": [
 		"TCB team (Wikimedia Deutschland)",
 		"Christoph Jauera",
 		"Addshore",
 		"Andrew Kostka"
 	],
 	"url": "https://www.mediawiki.org/wiki/Extension:TwoColConflict",
 	"descriptionmsg": "twocolconflict-desc",
 	"license-name": "GPL-2.0-or-later",
 	"type": "other",
 	"manifest_version": 1,
 	"requires": {
 		"MediaWiki": ">= 1.32.0"
 	},
 	"config": {
 		"@TwoColConflictBetaFeature": "Make the TwoColConflict feature a BetaFeature. Setting this requires the BetaFeature extension and requires each user to enable the BetaFeature.",
 		"TwoColConflictBetaFeature": true
 	},
 	"AutoloadNamespaces": {
 		"TwoColConflict\\": "includes/"
 	},
 	"Hooks": {
 		"GetBetaFeaturePreferences": [
 			"TwoColConflict\\TwoColConflictHooks::onGetBetaFeaturePreferences"
 		],
 		"AlternateEdit": [
 			"TwoColConflict\\TwoColConflictHooks::onAlternateEdit"
 		],
 		"EditPage::importFormData": [
 			"TwoColConflict\\TwoColConflictHooks::onImportFormData"
 		],
 		"EditPageBeforeConflictDiff": [
 			"TwoColConflict\\TwoColConflictHooks::onEditPageBeforeConflictDiff"
 		],
 		"EditPageBeforeEditButtons": [
 			"TwoColConflict\\TwoColConflictHooks::onEditPageBeforeEditButtons"
 		],
 		"ResourceLoaderTestModules": [
 			"TwoColConflict\\TwoColConflictHooks::onResourceLoaderTestModules"
 		]
 	},
 	"MessagesDirs": {
 		"TwoColConflict": [
 			"i18n"
 		]
 	},
 	"ExtensionMessagesFiles": {
 		"TwoColConflictAlias": "TwoColConflict.alias.php"
 	},
 	"ResourceModules": {
-		"ext.TwoColConflict.Settings": {
-			"scripts": [
-				"modules/ext.TwoColConflict.Settings.js"
-			],
-			"dependencies": [
-				"mediawiki.user",
-				"mediawiki.storage",
-				"mediawiki.cookie",
-				"mediawiki.api",
-				"user.options"
-			]
-		},
 		"ext.TwoColConflict.SpecialConflictTestPageCss": {
 			"styles": [
 				"modules/SpecialConflictTestPage/ext.TwoColConflict.SpecialConflictTestPage.css"
 			]
 		},
 		"ext.TwoColConflict.SplitJs": {
 			"scripts": [
 				"modules/SplitTwoColConflict/ext.TwoColConflict.Split.init.js"
 			],
 			"dependencies": [
 				"mediawiki.api",
 				"oojs-ui",
 				"ext.TwoColConflict.Split.Merger",
 				"ext.TwoColConflict.Split.Tour"
 			],
 			"messages": [
 				"continue-editing",
 				"preview",
 				"previewnote",
 				"twocolconflict-split-disabled-edit-tooltip"
 			]
 		},
 		"ext.TwoColConflict.SplitCss": {
 			"styles": [
 				"modules/SplitTwoColConflict/ext.TwoColConflict.Split.less",
 				"modules/SplitTwoColConflict/ext.TwoColConflict.Split.editable.less"
 			]
 		},
 		"ext.TwoColConflict.Split.TourImages": {
 			"class": "ResourceLoaderImageModule",
 			"selector": ".mw-twocolconflict-split-tour-slide-{name}",
 			"images": {
 				"1": {
 					"file": {
 						"ltr": "resources/ext.TwoColConflict.Split.Tour/slide1-ltr.png",
 						"rtl": "resources/ext.TwoColConflict.Split.Tour/slide1-rtl.png"
 					}
 				}
 			}
 		},
 		"ext.TwoColConflict.Split.Tour": {
 			"scripts": [
+				"modules/ext.TwoColConflict.Settings.js",
 				"modules/SplitTwoColConflict/ext.TwoColConflict.Split.Tour.js"
 			],
 			"styles": [
 				"modules/SplitTwoColConflict/ext.TwoColConflict.Split.Tour.less"
 			],
 			"dependencies": [
 				"oojs-ui",
 				"oojs-ui.styles.icons-interactions",
 				"ext.TwoColConflict.Split.TourImages",
-				"ext.TwoColConflict.Settings"
+				"mediawiki.user",
+				"mediawiki.storage",
+				"mediawiki.cookie",
+				"mediawiki.api",
+				"user.options"
 			],
 			"messages": [
 				"twocolconflict-split-tour-dialog-header",
 				"twocolconflict-split-tour-dialog-message",
 				"twocolconflict-split-tour-dialog-btn-text",
 				"twocolconflict-split-tour-popup-btn-text",
 				"twocolconflict-split-tour-popup1-header",
 				"twocolconflict-split-tour-popup1-message",
 				"twocolconflict-split-tour-popup2-header",
 				"twocolconflict-split-tour-popup2-message",
 				"twocolconflict-split-tour-popup3-header",
 				"twocolconflict-split-tour-popup3-message",
 				"twocolconflict-split-reset-warning",
 				"twocolconflict-split-reset-warning-cancel",
 				"twocolconflict-split-reset-warning-accept"
 			]
 		},
 		"ext.TwoColConflict.Split.Merger": {
 			"scripts": [
 				"modules/SplitTwoColConflict/ext.TwoColConflict.Split.Merger.js"
 			]
 		}
 	},
 	"EventLoggingSchemas": {
 		"TwoColConflictConflict": 18155295
 	},
 	"ResourceFileModulePaths": {
 		"localBasePath": "",
 		"remoteExtPath": "TwoColConflict"
 	},
 	"SpecialPages": {
 		"SimulateTwoColEditConflict": "TwoColConflict\\SpecialConflictTestPage\\SpecialConflictTestPage"
 	}
 }