diff --git a/CHANGELOG.md b/CHANGELOG.md
index 55de1b0b..86ba6848 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -203,10 +203,7 @@ All major and minor version changes will be documented in this file. Details of
 
 
 
-<<<<<<< HEAD
-=======
 [9.13.0]: https://github.com/gchq/CyberChef/releases/tag/v9.13.0
->>>>>>> d78730edc0fcb9a03670ad7795908313e86002d6
 [9.12.0]: https://github.com/gchq/CyberChef/releases/tag/v9.12.0
 [9.11.0]: https://github.com/gchq/CyberChef/releases/tag/v9.11.0
 [9.10.0]: https://github.com/gchq/CyberChef/releases/tag/v9.10.0
@@ -293,10 +290,7 @@ All major and minor version changes will be documented in this file. Details of
 [@VirtualColossus]: https://github.com/VirtualColossus
 [@cbeuw]: https://github.com/cbeuw
 [@matthieuxyz]: https://github.com/matthieuxyz
-<<<<<<< HEAD
-=======
 [@Flavsditz]: https://github.com/Flavsditz
->>>>>>> d78730edc0fcb9a03670ad7795908313e86002d6
 
 [#95]: https://github.com/gchq/CyberChef/pull/299
 [#173]: https://github.com/gchq/CyberChef/pull/173
@@ -361,7 +355,4 @@ All major and minor version changes will be documented in this file. Details of
 [#653]: https://github.com/gchq/CyberChef/pull/653
 [#865]: https://github.com/gchq/CyberChef/pull/865
 [#912]: https://github.com/gchq/CyberChef/pull/912
-<<<<<<< HEAD
-=======
 [#948]: https://github.com/gchq/CyberChef/pull/948
->>>>>>> d78730edc0fcb9a03670ad7795908313e86002d6
diff --git a/src/core/lib/FileSignatures.mjs b/src/core/lib/FileSignatures.mjs
index 8d57797e..0bc86ff0 100644
--- a/src/core/lib/FileSignatures.mjs
+++ b/src/core/lib/FileSignatures.mjs
@@ -3001,51 +3001,6 @@ export function extractBMP(bytes, offset) {
     return stream.carve();
 }
 
-/**
- * ICO extractor.
- *
- * @param {Uint8Array} bytes
- * @param {number} offset
- */
-export function extractICO(bytes, offset) {
-    const stream = new Stream(bytes.slice(offset));
-
-    // Move to number of files there are.
-    stream.moveTo(4);
-
-    // Read the number of files stored in the ICO
-    const numberFiles = stream.readInt(2, "le");
-
-    // Move forward to the last file header.
-    stream.moveForwardsBy(8 + ((numberFiles-1) * 16));
-    const fileSize = stream.readInt(4, "le");
-    const fileOffset = stream.readInt(4, "le");
-
-    // Move to the end of the last file.
-    stream.moveTo(fileOffset + fileSize);
-    return stream.carve();
-}
-
-
-/**
- * WAV extractor.
- *
- * @param {Uint8Array} bytes
- * @param {Number} offset
- * @returns {Uint8Array}
- */
-export function extractWAV(bytes, offset) {
-    const stream = new Stream(bytes.slice(offset));
-
-    // Move to file size field.
-    stream.moveTo(4);
-
-    // Move to file size.
-    stream.moveTo(stream.readInt(4, "le"));
-
-    return stream.carve();
-}
-
 
 /**
  * ICO extractor.