diff --git a/CHANGELOG.md b/CHANGELOG.md
index 5e8278e..34839d6 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,4 +1,5 @@
 ## CHANGELOG:
+* v4.2 - Fixed bad merge in 4.1 causing sniper to break.
 * v4.1 - Fixed a few bugs with various command line switches for airstrike and nuke modes.
 * v4.1 - Fixed issue with path relative file inclusion via the -f flag. You can now include just the local filename (sniper -f targets.txt).
 * v4.0 - Added new command switch options for all sniper scans (see --help for details)
diff --git a/sniper b/sniper
index 3b5d334..a8c1f13 100755
--- a/sniper
+++ b/sniper
@@ -217,11 +217,8 @@ case $key in
     shift # past argument
     ;;
     -nl|--noloot)
-<<<<<<< HEAD
     LOOT="0"
-=======
     NOLOOT="1"
->>>>>>> b13866c8026af59a392a05f3b2254c4a1f049c81
     shift # past argument
     ;;
     -w|--workspace)