diff --git a/projects/gnupg.org/gpg b/projects/gnupg.org/gpg
index 8cac3d74..87b7e8f6 100755
--- a/projects/gnupg.org/gpg
+++ b/projects/gnupg.org/gpg
@@ -5,16 +5,10 @@ etc="$d/../etc/gnupg"
 
 export GNUPGHOME="${GNUPGHOME:-"$etc"}"
 
-<<<<<<< HEAD
-mkdir -p "$etc"
-chmod 700 "$etc"
-cat << EOF > "$etc"/gpg.conf
-=======
 if [ ! -f "$etc/gpg.conf" ]; then
   mkdir -p "$etc"
   chmod 700 "$etc"
   cat << EOF > "$etc"/gpg.conf
->>>>>>> 055bba74 (deps on `*` considered harmful)
 use-agent
 pinentry-mode loopback
 agent-program $d/gpg-agent