Fix Dropdown inconsistency

packages/app/src/shared/components/ToggleButton/ToggleButton.styles.tsx

@@ -115,7 +115,6 @@ const disabled = ({ disabled }: ToggleButtonStyleProps) =>
       `
     : null
 
-<<<<<<< HEAD
 export const StyledToggleButton = styled(Button)`
      transition: all 0.4s cubic-bezier(0.165, 0.84, 0.44, 1);
       ${colorsFromProps}
@@ -123,17 +122,3 @@ export const StyledToggleButton = styled(Button)`
       ${hoverTransition}
       ${disabled}
       `
-=======
-export const StyledToggleButton: React.FC<ToggleButtonStyleProps> = (props) => (
-  <Button
-    {...props}
-    containerCss={css`
-     transition: all 0.4s cubic-bezier(0.165, 0.84, 0.44, 1);
-      ${colorsFromProps(props)}
-      ${pressed(props)}
-      ${hoverTransition(props)}
-      ${disabled(props)}
-      `}
-  />
-)
->>>>>>> Create ToggleButton And Add Animation To ChannelPreview