diff --git a/usr/bin/nmap_sA b/usr/bin/nmap_sA
index bc25e1e..a98376e 100755
--- a/usr/bin/nmap_sA
+++ b/usr/bin/nmap_sA
@@ -1,10 +1,6 @@
 #!/bin/bash
 nmap_sA () 
 { 
-<<<<<<< HEAD
     nmap -Pn -sA --reason $@
-=======
-    nmap -sA --reason -Pn
->>>>>>> d4ee7bf (modified:   alpine-qemu-install)
 }
 nmap_sA "$@"