diff --git a/Changes b/Changes
index 6a3ed5a..c2c6e60 100755
--- a/Changes
+++ b/Changes
@@ -6,11 +6,16 @@
           response.
         - Added utility funcition to menu that gets all direct
           childNodes by a tag. Used in menu-style specs. (lerepp)
+<<<<<<< HEAD
         - Remove 'X-Frame-Options' in favor of 'frame-ancestors'
           as a CSP rule.
         - Fix CSS compression for new SASS compiler.
         - Support dynamic menu extensions.
         - Dynamically extend buttongroup menus.
+=======
+        - Update to menu.js's removeItems function to only delete
+          direct childNodes aswell as a specification to test for it (lerepp)
+>>>>>>> Added the condition to removeItems, that the to be removedItem be direct child of the menus HTML element.
 
 0.42 2021-06-18
         - Added GitHub based CI for perl.