diff --git a/Htmldocs/release_notes.html b/Htmldocs/release_notes.html
index 4b84ffdd..e6cd8d8e 100644
--- a/Htmldocs/release_notes.html
+++ b/Htmldocs/release_notes.html
@@ -8,12 +8,9 @@
   </head>
   <body>
     <p>
-<<<<<<< HEAD
     <b>For other languages, go to:</b>
     <br>http://www.apneaboard.com/wiki/index.php/OSCAR_Release_Notes</p>
     <p>
-    <b>Changes and fixes in OSCAR v1.2.0</b>
-=======
     <b>Changes and fixes in OSCAR v1.2.0-beta-2</b>
     <br>Portions of OSCAR are © 2019-2020 by
     <i>The OSCAR Team</i></p>
@@ -28,7 +25,6 @@
     </ul></p>
     <p>
     <b>Changes and fixes in OSCAR v1.2.0-beta-1</b>
->>>>>>> e39adbd41ec60e2787e34a840afdfa1114baba19
     <br>Portions of OSCAR are © 2019-2020 by
     <i>The OSCAR Team</i></p>    <ul>
       <li>[new] Support for Chromebooks using Linux beta - (Intel/AMD only)</li>
