fixed merge

layouts/partials/footer/social.html

 {{ $menu := partial "GetMenu" "social" }}
+{{ $site_social_links := index site.Data.website.social }}
 
 {{ if $menu }}
   {{ partial "commons/menu.html"

yarn.lock

@@ -106,7 +106,6 @@ intersection-observer@^0.12.0:
   version "0.12.2"
   resolved "https://registry.yarnpkg.com/intersection-observer/-/intersection-observer-0.12.2.tgz#4a45349cc0cd91916682b1f44c28d7ec737dc375"
   integrity sha512-7m1vEcPCxXYI8HqnL8CKI6siDyD+eIWSwgB3DZA+ZTogxk9I4CDnj4wilt9x/+/QbHI4YG5YZNmC6458/e9Ktg==
-<<<<<<< HEAD
 
 is-core-module@^2.13.0:
   version "2.13.0"
@@ -114,8 +113,6 @@ is-core-module@^2.13.0:
   integrity sha512-Z7dk6Qo8pOCp3l4tsX2C5ZVas4V+UxwQodwZhLopL91TX8UyyHEXafPcyoeeWuLrwzHcr3igO78wNLwHJHsMCQ==
   dependencies:
     has "^1.0.3"
-=======
->>>>>>> main
 
 leaflet@^1.9.4:
   version "1.9.4"