diff --git a/apps/react/case-portal/yarn.lock b/apps/react/case-portal/yarn.lock
index e7c54a6d..a32e522c 100644
--- a/apps/react/case-portal/yarn.lock
+++ b/apps/react/case-portal/yarn.lock
@@ -7820,11 +7820,7 @@ wrappy@1:
   resolved "https://registry.yarnpkg.com/wrappy/-/wrappy-1.0.2.tgz#b5243d8f3ec1aa35f1364605bc0d1036e30ab69f"
   integrity sha512-l4Sp/DRseor9wL6EvV2+TuQn63dMkPjZ/sp9XkghTEbV9KlPS1xUsZ3u7/IQO4wxtcFB4bgpQPRcR3QCvezPcQ==
 
-<<<<<<< Updated upstream
-ws@^8.16.0, ws@^8.17.1:
-=======
 ws@^8.16.0, ws@^8.17.1, ws@~8.17.1:
->>>>>>> Stashed changes
   version "8.17.1"
   resolved "https://registry.yarnpkg.com/ws/-/ws-8.17.1.tgz#9293da530bb548febc95371d90f9c878727d919b"
   integrity sha512-6XQFvXTkbfUOZOKKILFG1PDK2NDQs4azKQl26T0YS5CxqWLgXajbPZ+h4gZekJyRqFU8pvnbAbbs/3TgRPy+GQ==