fix branch conflicts

Author: 29avet1

.vitepress/config.ts

@@ -127,10 +127,11 @@ const nav: ThemeConfig['nav'] = [
   },
   {
     text: 'Experts',
+    badge: { text: 'NEW' },
     activeMatch: `^/(partners|developers)/`,
     items: [
       { text: 'Partners', link: '/partners/' },
-      { text: 'Developers', link: '/developers/' }
+      { text: 'Developers', link: '/developers/', badge: { text: 'NEW' } }
     ]
   }
 ]

src/developers/developers.json

@@ -10,7 +10,6 @@ const hireUrl = 'https://proxify.io/hire-vuejs'
 const vueArticleUrl = 'https://proxify.io/hire-vue-developers'
 const imageStorageUrl = 'https://res.cloudinary.com/proxify-io/image/upload'
 
-
 const partnerConfig = {
   // Partner information
   partnerName: partner?.name,