message: docs: fix unresolved conflict
diff: @@ -177,7 +177,6 @@ render(<StackEx />)
  ### Props
  -<<<<<<< HEAD
  | Name | Type | Description |
  | -------------------- | ----------------------------- | ------------------------------------------------------------------------------------------------------------------------ |
  | `direction` | `Responsive(row or column)` | The direction to stack the elements |
  @@ -187,13 +186,4 @@ render(<StackEx />)
  | `align` | `FlexProps["alignItems"]` | The alignment of the stack item. Similar to `align-items` |
  | `justify` | `FlexProps["justifyContent"]` | The distribution of the stack item. Similar to `justify-content` |
  | `shouldWrapChildren` | `boolean` | If `true`, the children will be wrapped in a `Box` with `display: inline-block`, and the Box will take the spacing props |
  -=======
  -| Name | Type | Default | Description |
  -| -------------------- | ----------------------------- | ------- | ------------------------------------------------------------------------------------------------------------------------ |
  -| `direction` | `FlexProps["flexDirection"]` | | The direction to stack the items. |
  -| `children` | `React.ReactNode` | | The content of the stack. |
  -| `spacing` | `StyledSystem.MarginProps` | | The space between each stack item |
  -| `align` | `FlexProps["alignItems"]` | | The alignment of the stack item. Similar to `align-items` |
  -| `justify` | `FlexProps["justifyContent"]` | | The distribution of the stack item. Similar to `justify-content` |
  -| `shouldWrapChildren` | `boolean` | | If `true`, the children will be wrapped in a `Box` with `display: inline-block`, and the Box will take the spacing props |
  ->>>>>>> master
  +
  