Fix conflict

diff --cc basis/help/markup/markup.factor
index c6bc70cef0d84ab07c7370535a86002570022c82,2fd8d55d10a4976c1404e5e94081df959973459d..e9c818a8e0e67f9d1b130cf9ff18fea9e35d3fc2
--- 1/basis/help/markup/markup.factor
--- 2/basis/help/markup/markup.factor
+++ b/basis/help/markup/markup.factor
@@@ -2,18 -2,11 +2,10 @@@
  ! See http://factorcode.org/license.txt for BSD license.
  USING: accessors arrays definitions generic io kernel assocs
  hashtables namespaces make parser prettyprint sequences strings
 -io.styles vectors words math sorting splitting classes slots
 -vocabs help.stylesheet help.topics vocabs.loader quotations
 -combinators ;
 +io.styles vectors words math sorting splitting classes slots fry
 +sets vocabs help.stylesheet help.topics vocabs.loader quotations ;
  IN: help.markup
  
- ! Simple markup language.
- 
- ! <element> ::== <string> | <simple-element> | <fancy-element>
- ! <simple-element> ::== { <element>* }
- ! <fancy-element> ::== { <type> <element> }
- 
- ! Element types are words whose name begins with $.
- 
  PREDICATE: simple-element < array
      [ t ] [ first word? not ] if-empty ;
  

diff --cc basis/prettyprint/prettyprint.factor
Simple merge

diff --cc basis/ui/gadgets/editors/editors.factor
index 2161093c15b4fd380fcc85c4065f85374ae4d9f9,dc2cedfef85501bc9a5fe0fb1cefd25a98b8a0ed..fb7f0b40a19164530a2c1fff05368e7b4dae834d
--- 1/basis/ui/gadgets/editors/editors.factor
--- 2/basis/ui/gadgets/editors/editors.factor
+++ b/basis/ui/gadgets/editors/editors.factor
@@@ -344,18 -350,18 +344,18 @@@ M: editor gadget-text* editor-string % 
      dupd editor-select-next mark>caret ;
  
  : editor-select ( from to editor -- )
-     tuck caret>> set-model mark>> set-model ;
+     tuck [ mark>> set-model ] [ caret>> set-model ] 2bi* ;
  
  : select-elt ( editor elt -- )
 -    [ [ [ editor-caret* ] [ model>> ] bi ] dip prev/next-elt ] [ drop ] 2bi
 +    [ [ [ editor-caret ] [ model>> ] bi ] dip prev/next-elt ] [ drop ] 2bi
      editor-select ;
  
 -: start-of-document ( editor -- ) T{ doc-elt } editor-prev ;
 +: start-of-document ( editor -- ) doc-elt editor-prev ;
  
 -: end-of-document ( editor -- ) T{ doc-elt } editor-next ;
 +: end-of-document ( editor -- ) doc-elt editor-next ;
  
  : position-caret ( editor -- )
 -    mouse-elt dup T{ one-char-elt } =
 +    mouse-elt dup one-char-elt =
      [ drop dup extend-selection dup mark>> click-loc ]
      [ select-elt ] if ;
  

diff --cc core/parser/parser.factor
Simple merge