Fix Conflict

yarn.lock :
- Resolve by use master head state (append new code)

packages/app/package.json:
- Using current branch head and adjust based on merged master state
- Remove "growi-plugin-attachment-refs" line
  because it has been changed to "@growi/plugin-attachment-refs"
  commit log = 204188fe7
- Remove "growi-plugin-lsx" line
  because it has been changed to "@growi/plugin-lsx"
  commit log = 1787cdda5

packages/app/package.json

@@ -96,14 +96,8 @@
     "express-webpack-assets": "^0.1.0",
     "graceful-fs": "^4.1.11",
     "growi-commons": "^5.0.4",
-<<<<<<< HEAD
-    "growi-plugin-attachment-refs": "^2.0.2",
-    "growi-plugin-lsx": "^4.0.3",
     "helmet": "^4.6.0",
     "nocache": "^3.0.1",
-=======
-    "helmet": "^3.13.0",
->>>>>>> f656a3e1b8ac561c4acccae032edc3ee207413a2
     "http-errors": "~1.6.2",
     "i18next": "^20.3.2",
     "i18next-express-middleware": "^2.0.0",

yarn.lock

@@ -20560,8 +20560,6 @@ x-is-string@^0.1.0:
   resolved "https://registry.yarnpkg.com/x-is-string/-/x-is-string-0.1.0.tgz#474b50865af3a49a9c4657f05acd145458f77d82"
   integrity sha1-R0tQhlrzpJqcRlfwWs0UVFj3fYI=
 
-<<<<<<< HEAD
-=======
 x-xss-protection@1.1.0:
   version "1.1.0"
   resolved "https://registry.yarnpkg.com/x-xss-protection/-/x-xss-protection-1.1.0.tgz#4f1898c332deb1e7f2be1280efb3e2c53d69c1a7"
@@ -20570,8 +20568,6 @@ xdg-basedir@^3.0.0:
   version "3.0.0"
   resolved "https://registry.yarnpkg.com/xdg-basedir/-/xdg-basedir-3.0.0.tgz#496b2cc109eca8dbacfe2dc72b603c17c5870ad4"
   integrity sha1-SWsswQnsqNus/i3HK2A8F8WHCtQ=
-
->>>>>>> f656a3e1b8ac561c4acccae032edc3ee207413a2
 xdg-basedir@^4.0.0:
   version "4.0.0"
   resolved "https://registry.yarnpkg.com/xdg-basedir/-/xdg-basedir-4.0.0.tgz#4bc8d9984403696225ef83a1573cbbcb4e79db13"