fix: Merge conflicts

Author: d3xter666

.gitignore

@@ -59,5 +59,11 @@ deploy_key
 jsdocs/
 site/
 
-# Custom files
+# Needed for packages/server	# Custom files
+!packages/**/test/fixtures/**/node_modules	
+
+# Documentation	
 packages/documentation/docs/pages/CLI.md
+packages/documentation/.vitepress/dist
+packages/documentation/.vitepress/cache
+packages/documentation/dist

packages/documentation/docs/Guidelines.md renamed to docs/Guidelines.md

@@ -51,8 +51,8 @@ export default defineConfig({
 
 
     logo:  {
-      light: "/icons/ui5/B.svg",
-      dark: "/icons/ui5/O.svg"
+      light: "/images/Logo_B_RGB.png",
+      dark: "/images/Logo_O_RGB.png"
     },
     externalLinkIcon: false,
     outline: [1,3],
@@ -65,13 +65,13 @@ export default defineConfig({
 
     socialLinks: [
 
-      { icon: "github", link: "https://github.com/SAP/ui5-tooling" },
+      { icon: "github", link: "https://github.com/UI5/cli" },
     ],
 
     footer: {
 
       message: `
-        &copy; Copyright ${new Date().getFullYear()}, SAP SE and UI5 Tooling Contributors <br/>
+        &copy; Copyright ${new Date().getFullYear()}, SAP SE and UI5 CLI Contributors <br/>
           <a style="margin:25px"href="https://www.sap.com/corporate/en/legal/impressum.html">Legal Disclosure</a>
           <a  style="margin:25px" href="https://www.sap.com/corporate/en/legal/terms-of-use.html">Terms of Use</a>
           <a  style="margin:25px" href="https://sap.github.io/ui25-tooling/stable/pages/Privacy/">Privacy</a>