diff --git a/CHANGELOG.md b/CHANGELOG.md
index f9095b1..5e8278e 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,10 +1,6 @@
 ## CHANGELOG:
-<<<<<<< HEAD
 * 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.1 - Fixed issue with sniper nuke command not working
->>>>>>> b13866c8026af59a392a05f3b2254c4a1f049c81
 * v4.0 - Added new command switch options for all sniper scans (see --help for details)
 * v4.0 - Added HTML formatted report for all workspaces to display screenshots, headers, reports and open ports
 * v4.0 - Added optional scan options such as --recon, --osint, --fullportonly --bruteforce, etc. to selectively enable scan modules. (see --help for details)