Fix merge conflicts

README.md

@@ -1,23 +1,13 @@
-<h1 align="center">Welcome to react-onesignal 👋</h1>
-<p>
-  <a href="https://www.npmjs.com/package/react-onesignal" target="_blank">
-    <img alt="Version" src="https://img.shields.io/npm/v/react-onesignal.svg">
-  </a>
-  <a href="https://github.com/OneSignal/react-onesignal#readme" target="_blank">
-    <img alt="Documentation" src="https://img.shields.io/badge/documentation-yes-brightgreen.svg" />
-  </a>
-  <a href="https://github.com/OneSignal/react-onesignal/graphs/commit-activity" target="_blank">
-    <img alt="Maintenance" src="https://img.shields.io/badge/Maintained%3F-yes-green.svg" />
-  </a>
-  <a href="https://twitter.com/onesignal" target="_blank">
-    <img alt="Twitter: onesignal" src="https://img.shields.io/twitter/follow/onesignal.svg?style=social" />
-  </a>
+<p align="center">
+  <img src="https://media.onesignal.com/cms/Website%20Layout/logo-red.svg"/>
+  <br/>
+  <br/>
+  <span style="color: grey !important">Showing web push notifications from Chrome, Safari, and Firefox</span>
 </p>
 
 > This is a JavaScript module that can be used to easily include [OneSignal](https://onesignal.com/) code in a website or app in practically any JS front-end codebase (not limited to React).
 
-* 🏠 [Homepage](https://github.com/OneSignal/react-onesignal#readme)
-* 🖤 [npm](https://www.npmjs.com/package/react-onesignal)
+This is a JavaScript module that can be used to easily include [OneSignal](https://onesignal.com/) code in a website or app that uses React for its front-end codebase.
 
 OneSignal is the world's leader for Mobile Push Notifications, Web Push, and In-App Messaging. It is trusted by 2 million+ businesses to send 9 billion Push Notifications per day.
 

example/yarn.lock

@@ -7512,6 +7512,11 @@ react-is@^18.0.0:
 "react-onesignal@file:..":
   version "3.0.0"
 
+[email protected]:
+  version "3.0.0-beta.3"
+  resolved "https://registry.yarnpkg.com/react-onesignal/-/react-onesignal-3.0.0-beta.3.tgz#8e6533db26fd6547996a3fefffe267c451ce154e"
+  integrity sha512-j4rwEPyNdFjBBFLhl6GMy9FvBzXUE7REBZDplByCgZyHcm3wlOwDrvBOGc3V50veqGKvYce43dgHGsyzD4kQJA==
+
 react-refresh@^0.11.0:
   version "0.11.0"
   resolved "https://registry.yarnpkg.com/react-refresh/-/react-refresh-0.11.0.tgz#77198b944733f0f1f1a90e791de4541f9f074046"