diff --git a/CHANGELOG b/CHANGELOG
index 7d6fcc488a269ab6ea88236697bec4da56d0ac6d..4dd9c9479fd5649030e655c49749255bb40c32ab 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -37,9 +37,6 @@
 2023-06-11: set upper cmk version to 2.2.0b1 for bgp_peer-2.0.1-20230611.mkp
 2023-06-11: moved wato file to check_parameters sub directory
             removed declare_invtable_view from view definition on cmk 2.2 (see werk 15493)
-<<<<<<< HEAD
 2023-06-13: added huawei metrics from huawei_bgp_peer
-=======
 2023-08-17: fix removed internal_item form check_default_parameters (THX mail[at]bastian-kuhn[dot]de)
             added warning if internal_item is missing in params            
->>>>>>> c8f94f1 (update project)