Resolve conflicts with main

apiary.apib

@@ -307,9 +307,7 @@ If an invalid access token was sent, the response is still a 401, though.
                 "version": "5.1.0.123",
                 "name": "Acrolinx Core Platform"
             },
-            "locales": {
-                "en"
-            }
+            "locales": [ "en" ]
           },
           "links": {
             "signIn": "https://tenant.acrolinx.cloud/api/v1/auth/sign-ins",
@@ -363,7 +361,7 @@ to authenticate the request.
 
             X-Acrolinx-Auth: 123579080a8d1fee12490a90dc3 (valid) OR (invalid/expired access token) OR (no access token)
             X-Acrolinx-Client-Locale: ja
-            X-Acrolinx-Client: QWxlU2hNyb2bHVnLWlunhQyR29Rm9xpbvZ2lZXRz; 1.0.1.45; 12345
+            X-Acrolinx-Client: QWxlU2hNyb2bHVnLWlunhQyR29Rm9xpbvZ2lZXRz; 1.0.1.45;
 
 + Response 200 (application/json)
     No sign-in needed, the response body will contain valid access tokens.
@@ -6531,7 +6529,7 @@ This lets you delete a specified role based on its *id*.
 
             X-Acrolinx-Auth: your_access_token
 
-+ Response 204 (application/json)
++ Response 204
 
 + Response 400 (application/json)
 
@@ -6817,19 +6815,19 @@ Retrieves active notifications from the platform.
 + Response 200 (application/json)
 
         {
-          "data":
-            {
-              "requestTimeInMilliseconds" : "1525449382",
-              "platformNotifications": [{
-              "id": "e06491e9-c67f-4da7-85da-eb30b9ca9101",
-              "title": "Important Announcement",
-              "body":  "Acrolinx Platform 5.6 will be deployed tomorrow.",
-              "importance": "high",
-              "start": 1528127782,
-              "end": 1530719782
-              }
-            ]
-          }}
+            "data": {
+                "requestTimeInMilliseconds": "1525449382",
+                "platformNotifications": [
+                    {
+                        "id": "e06491e9-c67f-4da7-85da-eb30b9ca9101",
+                        "title": "Important Announcement",
+                        "body": "Acrolinx Platform 5.6 will be deployed tomorrow.",
+                        "importance": "high",
+                        "start": 1528127782,
+                        "end": 1530719782
+                    }
+                ]
+            }
         }