Fixing merge conflict

config/config.json

@@ -5,8 +5,8 @@
         "SegmentDeveloperKey": "",
         "GoogleDeveloperKey": "",
         "EnableOAuthServiceProvider": false,
-        "EnableTesting": false,
+        "EnableIncomingWebhooks": false,
-        "EnableIncomingWebhooks": false
+        "EnableTesting": false
     },
     "TeamSettings": {
         "SiteName": "Mattermost",

docker/dev/config_docker.json

@@ -5,8 +5,8 @@
         "SegmentDeveloperKey": "",
         "GoogleDeveloperKey": "",
         "EnableOAuthServiceProvider": false,
-        "EnableTesting": false,
+        "EnableIncomingWebhooks": false,
-        "EnableIncomingWebhooks": false
+        "EnableTesting": false
     },
     "TeamSettings": {
         "SiteName": "Mattermost",

docker/local/config_docker.json

@@ -5,8 +5,8 @@
         "SegmentDeveloperKey": "",
         "GoogleDeveloperKey": "",
         "EnableOAuthServiceProvider": false,
-        "EnableTesting": false,
+        "EnableIncomingWebhooks": false,
-        "EnableIncomingWebhooks": false
+        "EnableTesting": false
     },
     "TeamSettings": {
         "SiteName": "Mattermost",

model/config.go

@@ -25,8 +25,8 @@ type ServiceSettings struct {
 	SegmentDeveloperKey        string
 	GoogleDeveloperKey         string
 	EnableOAuthServiceProvider bool
-	EnableTesting              bool
 	EnableIncomingWebhooks     bool
+	EnableTesting              bool
 }
 
 type SSOSettings struct {