cart-icon on menu fix
Resolved conflict
?