diff --git a/basis/io/backend/unix/freebsd/freebsd.factor b/basis/io/backend/unix/freebsd/freebsd.factor
index 93a186d3f2..24c7518827 100644
--- a/basis/io/backend/unix/freebsd/freebsd.factor
+++ b/basis/io/backend/unix/freebsd/freebsd.factor
@@ -1,4 +1,3 @@
-<<<<<<< HEAD
 USING: io.backend io.backend.unix system namespaces kernel accessors assocs continuations unix init io.backend.unix.multiplexers io.backend.unix.multiplexers.kqueue vocabs io.files.unix ;
 
 << "io.files.unix" require >> ! needed for deploy
@@ -10,8 +9,3 @@ freebsd set-io-backend
 
 [ start-signal-pipe-thread ] 
 "io.backend.unix:signal-pipe-thread" add-startup-hook
-=======
-USING: io.backend.unix.bsd io.backend system ;
-
-freebsd set-io-backend
->>>>>>> da9226d5b5... Re-add Freebsd Support