diff --git a/CHANGES.md b/CHANGES.md
index 0dc19a480..a81af5975 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -75,7 +75,6 @@
 - Fix titles in viewer thumbnails too long [Taiga #1474](https://tree.taiga.io/project/penpot/issue/1474)
 - Fix when right click on a selected text shows artboard contextual menu [Taiga #1226](https://tree.taiga.io/project/penpot/issue/1226)
 
->>>>>>> origin/staging
 
 ### :arrow_up: Deps updates