diff --git a/CHANGELOG.md b/CHANGELOG.md
index 7d54a49..3981716 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -16,7 +16,6 @@
 * add compatibility with NC33
 ### Fixed
 * fix #468: force nextcloud logo display css rule (opener-only)
->>>>>>> develop
 
 ## 5.1.3
 ### Fixed