diff --git a/release/picobsd/build/picobsd b/release/picobsd/build/picobsd
index 0957285ea39..71b9a28f42c 100755
--- a/release/picobsd/build/picobsd
+++ b/release/picobsd/build/picobsd
@@ -1,10 +1,6 @@
 #!/bin/sh -
 #
-<<<<<<< picobsd
 # $FreeBSD$
-=======
-# $FreeBSD$
->>>>>>> 1.18
 #
 # The new PicoBSD build script. Invoked as
 #