Fix conflict

diff --cc basis/bootstrap/ui/ui.factor
index 0b39ea18665a53c217230a0da8b9627d1449cf07,7c1c2674e57de683549ab24b19bd8837a0475a2d..fd09d3663f49d12a0e915034e8404e898e4b2f2c
--- 1/basis/bootstrap/ui/ui.factor
--- 2/basis/bootstrap/ui/ui.factor
+++ b/basis/bootstrap/ui/ui.factor
@@@ -2,14 -2,12 +2,14 @@@ USING: alien namespaces system combinat
  vocabs vocabs.loader ;
  IN: bootstrap.ui
  
 -"bootstrap.compiler" vocab [
 -    "ui-backend" get [
 -        {
 -            { [ os macosx? ] [ "cocoa" ] }
 -            { [ os windows? ] [ "windows" ] }
 -            { [ os unix? ] [ "gtk" ] }
 -        } cond
 -    ] unless* "ui.backend." prepend require
 -] when
 +"bootstrap.math" require
 +"bootstrap.compiler" require
 +"bootstrap.threads" require
 +
 +"ui-backend" get [
 +    {
 +        { [ os macosx? ] [ "cocoa" ] }
 +        { [ os windows? ] [ "windows" ] }
-         { [ os unix? ] [ "x11" ] }
++        { [ os unix? ] [ "gtk" ] }
 +    } cond
 +] unless* "ui.backend." prepend require