Fix conflict

diff --cc basis/io/styles/styles-docs.factor
Simple merge

diff --cc basis/io/styles/styles.factor
Simple merge

diff --cc basis/ui/gadgets/panes/panes.factor
index e7e02bf54d482d4231c310b20df414d2e64fbcf3,569d6e0f3f4fe57456f2cd5a679f6db83562a893..ffd30ae2fa1d017c1c660567a27a828910746db6
--- 1/basis/ui/gadgets/panes/panes.factor
--- 2/basis/ui/gadgets/panes/panes.factor
+++ b/basis/ui/gadgets/panes/panes.factor
@@@ -6,8 -6,8 +6,8 @@@ ui.gadgets.incremental ui.gadgets.pack
  ui.gadgets.menus ui.clipboards ui.gestures ui.traverse ui.render
  hashtables io kernel namespaces sequences io.styles strings
  quotations math opengl combinators math.vectors sorting
- splitting io.streams.nested assocs ui.gadgets.presentations
+ splitting assocs ui.gadgets.presentations
 -ui.gadgets.slots ui.gadgets.grids ui.gadgets.grid-lines
 +ui.gadgets.grids ui.gadgets.grid-lines
  classes.tuple models continuations destructors accessors
  math.geometry.rect fry ;
  IN: ui.gadgets.panes