diff --git a/CHANGELOG.md b/CHANGELOG.md
index 2092d0a6..6dbcecb8 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -42,7 +42,6 @@
 
 - Add personal email notifications
 - Bug fixes
->>>>>>> dev
 
 ## v1.0.40 (2022-10-05)