several detail changes

frontend/dashboard/pnpm-lock.yaml

@@ -229,6 +229,7 @@ devDependencies:
 
 packages:
 
+<<<<<<< Updated upstream
 <<<<<<< HEAD
   /@aashutoshrathi/word-wrap@1.2.6:
     resolution: {integrity: sha512-1Yjs2SvM8TflER/OD3cOjhWWOZb58A2t7wpE2S9XfBYTiIl+XFhQG2bjy4Pu1I+EAlCNUzRDYDdFwFYUKvXcIA==}
@@ -237,16 +238,21 @@ packages:
 
 =======
 >>>>>>> a54708abb5d46d7d7319730306a528d33d910895
+=======
+>>>>>>> Stashed changes
   /@ajoelp/json-to-formdata@1.5.0:
     resolution: {integrity: sha512-nrlfeTSL0X0dtx5r2KpzPiqLSIQquiiJjUKsQAKzWaCmO2QoYZCyb5ENZwF3YoffKronOCJr25mxaD8JRJmK8w==}
     dependencies:
       lodash: 4.17.21
     dev: false
 
+<<<<<<< Updated upstream
 <<<<<<< HEAD
   /@ampproject/remapping@2.2.1:
     resolution: {integrity: sha512-lFMjJTrFL3j7L9yBxwYfCq2k6qqwHyzuUl/XBnif78PWTJYyL/dfowQHWE3sp6U6ZzqWiiIZnpTMO96zhkjwtg==}
 =======
+=======
+>>>>>>> Stashed changes
   /@ampproject/remapping@2.2.0:
     resolution: {integrity: sha512-qRmjj8nj9qmLTQXXmaR1cck3UXSRMPrbsLJAasZpF+t3riI71BXed5ebIOYwQntykeZuhjsdweEc9BxH5Jc26w==}
 >>>>>>> a54708abb5d46d7d7319730306a528d33d910895
@@ -1769,6 +1775,7 @@ packages:
 
   /@emotion/memoize@0.7.4:
     resolution: {integrity: sha512-Ja/Vfqe3HpuzRsG1oBtWTHk2PGZ7GR+2Vz5iYGelAw8dx32K0y7PjVuxK6z1nMpZOqAFsRUPCkK1YjJ56qJlgw==}
+    requiresBuild: true
     dev: false
     optional: true