diff --git a/README.md b/README.md
index 140bf93..9607b3d 100644
--- a/README.md
+++ b/README.md
@@ -98,12 +98,8 @@ Allows you to change the first map where the adventure begins and the initial mo
 
 ### Script Editor:
 - Replaced "Search Flag" with "Search any command".
-<<<<<<< HEAD
 - Removed script cmd buttons.
 - Added script navigator.
-=======
-- Enabled some of the quick script cmd buttons.
->>>>>>> 3431ae2... First commit
 - Level scripts can be cleared with a button click.
 - The Script Editor can identify and report some errors.
 - Fixed problem with backward jumps.