fix leftover merge result

Signed-off-by: Stephane Bouchet <sbouchet@redhat.com>

Author: sbouchet

.rebase/CHANGELOG.md

@@ -2,6 +2,22 @@
 
 The file to keep a list of changed files which will potentionaly help to resolve rebase conflicts.
 
+#### @sbouchet
+https://github.com/che-incubator/che-code/pull/659
+
+- code/package.json
+- code/build/package.json
+- code/build/npm/gyp/package.json
+- code/extensions/css-language-features/package.json
+- code/extensions/html-language-features/package.json
+- code/extensions/json-language-features/package.json
+- code/extensions/markdown-language-features/package.json
+- code/extensions/npm/package.json
+- code/test/mcp/package.json
+- code/test/automation/package.json
+- code/test/integration/browser/package.json
+- code/test/smoke/package.json
+---
 
 #### @sbouchet
 https://github.com/che-incubator/che-code/pull/669
@@ -35,20 +51,6 @@ https://github.com/che-incubator/che-code/pull/661
 
 - code/package.json
 - code/build/npm/gyp/package.json
-https://github.com/che-incubator/che-code/pull/659
-
-- code/package.json
-- code/build/package.json
-- code/build/npm/gyp/package.json
-- code/extensions/css-language-features/package.json
-- code/extensions/html-language-features/package.json
-- code/extensions/json-language-features/package.json
-- code/extensions/markdown-language-features/package.json
-- code/extensions/npm/package.json
-- code/test/mcp/package.json
-- code/test/automation/package.json
-- code/test/integration/browser/package.json
-- code/test/smoke/package.json
 ---
 
 #### @RomanNikitenko

.rebase/add/code/build/package.json

@@ -8,12 +8,12 @@
         },
         "qs": "6.14.1",
         "lodash": "^4.17.23",
-        "fast-xml-parser": "^4.5.4",
         "@vscode/vsce": {
             "minimatch": "^3.1.5"
         },
         "vscode-universal-bundler": {
             "minimatch": "^9.0.9"
-        }
+        },
+        "fast-xml-parser": "^4.5.4"
     }
 }