diff --git a/VERSION b/VERSION
index 3e2c625..8d0c9d6 100644
--- a/VERSION
+++ b/VERSION
@@ -2,16 +2,9 @@ v0.2.6
 
 Changelog
 
-<<<<<<< HEAD
  * Settings Updates
    * Choose to hide items on filter
    * Choose boards when creating/editing a user
  * Comments can be edited
  * Dates show up on comments and attachments without reload
  * Opening login page redirects to boards if a valid token is found
-
-=======
- * Markdown support in comments
- * Cursor on default input field
- * Show app version
->>>>>>> master