fix resolving merge

Author: scott-williams-az

packages/component-header-footer/src/header/components/HeaderMain/NavbarContainer/DropdownItem/index.js

@@ -26,7 +26,7 @@ HeadingItem.propTypes = {
 };
 
 const ButtonItem = ({ link, dropdownName, handleLinkEvent }) => (
-  <li className={CLASS_NAMES.NAV_BUTTON}>
+  <div className={CLASS_NAMES.NAV_BUTTON}>
     <Button
       text={link.text}
       color={link.color || "maroon"}