message: fix: Undo bad merge conflict
diff: import PropTypes from 'prop-types';
  import React from 'react';
  -import { Box } from '../..';
  +import { prependClassName } from '../../helpers/prependClassName';
  export function Tag({
  + is: TagName = 'span',
  + small,
  + medium,
  + className,
  disabled,
  - round,
  - variant = 'secondary',
  onClick,
  + variant = 'secondary',
  ...props
  }) {
  + const modifiers = [
  + variant,
  + small && 'small',
  + medium && 'medium',
  + disabled && 'disabled',
  + onClick && 'clickable',
  + ]
  + .map((modifier) => `rcx-tag--${modifier}`)
  + .filter(Boolean)
  + .join(' ');
  +
  return (
  - <Box
  - is='span'
  - rcx-tag
  - rcx-tag--warning={variant === 'warning'}
  - rcx-tag--secondary={variant === 'secondary'}
  - rcx-tag--primary={variant === 'primary'}
  - rcx-tag--danger={variant === 'danger'}
  - rcx-tag--ghost={variant === 'ghost'}
  - rcx-tag--disabled={!!disabled}
  - rcx-tag--round={!!round}
  - rcx-tag--clickable={!!onClick}
  - onClick={onClick}
  + <TagName
  + className={prependClassName(className, `rcx-tag ${modifiers}`)}
  {...props}
  />
  );
  }
  Tag.propTypes = {
  + small: PropTypes.bool,
  + medium: PropTypes.bool,
  disabled: PropTypes.bool,
  - round: PropTypes.bool,
  + onClick: PropTypes.func,
  variant: PropTypes.oneOf([
  'secondary',
  'primary',
  