diff --git a/basis/classes/struct/struct-tests.factor b/basis/classes/struct/struct-tests.factor
index ae39f62868..4ed7d9b446 100644
--- a/basis/classes/struct/struct-tests.factor
+++ b/basis/classes/struct/struct-tests.factor
@@ -474,7 +474,3 @@ CONSULT: struct-test-delegate struct-test-delegator del>> ;
         7 >>a
         8 >>b
 ] unit-test
-<<<<<<< HEAD
-=======
-
->>>>>>> alien.data: make binary-zero? public and move it from classes.struct.private