--- a/src/brand/attach	Sun Jun 05 00:53:41 2011 +0100
+++ b/src/brand/attach	Sun Jun 05 12:11:05 2011 +0100
@@ -120,13 +120,9 @@
 trap trap_cleanup INT
 trap trap_exit EXIT
 
-<<<<<<< local
-PKG=pkg
-=======
 #set -o xtrace
 
 PKG="/usr/bin/pkg"
->>>>>>> other
 KEYDIR=/var/pkg/ssl
 
 # If we weren't passed at least two arguments, exit now.
@@ -164,9 +160,6 @@
 typeset gz_incorporations=""
 
 #
-<<<<<<< local
-verbose=""
-=======
 # Gather the zone publisher details. $1 is the location of the image we
 # are processing and $2 is an associative array used to store publisher
 # details.
@@ -341,7 +334,6 @@
 	echo "$args"
 }
 
->>>>>>> other
 # Other brand attach options are invalid for this brand.
 while getopts "a:d:n:r:uv" opt; do
 	case $opt in