merge and resolve conflict

public/global.scss

@@ -1,6 +1,8 @@
 @import "fontiran";
+@import "react-toastify/dist/ReactToastify.css";
 
 .filter-toast {
-  box-shadow: rgba(50, 50, 93, 0.25) 0px 13px 27px -5px, rgba(0, 0, 0, 0.3) 0px 8px 16px -8px;
+  box-shadow: rgba(50, 50, 93, 0.25) 0px 13px 27px -5px,
+    rgba(0, 0, 0, 0.3) 0px 8px 16px -8px;
   background-color: #d0dfe8;
-}
+}