remove merge artifact

app-shell/build/release-notes.md

@@ -8,21 +8,13 @@ log][]. For a list of currently known issues, please see the [Opentrons issue tr
 
 # Opentrons App Changes in 5.1.0-beta.0
 
-<<<<<<< Updated upstream
-Welcome to the beta release of v5.1.0 of the Opentrons App!
-
-After you update your app, please be sure to update any OT-2s you will be using with this beta.
-The 5.1.0 release reshapes the main navigational structure. We're very excited for you to try this new experience out, and we appreciate your feedback (and patience) as you use this new software.
-=======
-
 Welcome to the beta release of v5.1.0 release of the Opentrons App!
 
 After you update your app, please be sure to update any OT-2's you will be using with this beta.
 The 5.1.0 release reshapes the main navigational structure. We're very excited for you to try this new experience out, and we appreciate your feedback (and patience) as you use this new software.
 
-> > > > > > > Stashed changes
-> > > > > > > This is beta software! You may experience unexpected crashes or missing features not detailed here. Please see the [issue tracker][] for more details and to leave feedback.
-> > > > > > > [issue tracker]: https://github.com/Opentrons/opentrons/issues/new?assignees=y3rsh%2Cnusrat813&labels=5.1-feedback&template=testing_feedback.yml&title=5.1+Feedback%3A++%3Ctitle%3E
+This is beta software! You may experience unexpected crashes or missing features not detailed here. Please see the [issue tracker][] for more details and to leave feedback.
+[issue tracker]: https://github.com/Opentrons/opentrons/issues/new?assignees=y3rsh%2Cnusrat813&labels=5.1-feedback&template=testing_feedback.yml&title=5.1+Feedback%3A++%3Ctitle%3E
 
 ## New Features