diff --git a/NOTICE.md b/NOTICE.md
index a83d625..cc84293 100644
--- a/NOTICE.md
+++ b/NOTICE.md
@@ -9,13 +9,6 @@ This project uses the following external assets:
 | `./entities/sheep_drag.wav` | https://freesound.org/people/michaelperfect/sounds/710298/ | CC0 |
 | `./temp/click&pop.wav` | https://freesound.org/people/GammaGool/sounds/730488/ | CC0 |
 | `./temp/pop.wav` | https://freesound.org/people/NovaSoundTechnology/sounds/727104/ | CC0 |
-<<<<<<< HEAD
-| `./temp/mouth_pop.wav` | https://freesound.org/people/igaopuromalte/sounds/725453/ | CC-BY 4.0 |
-| `./temp/puff.wav` | https://freesound.org/people/JustInvoke/sounds/446124/ | CC-BY 4.0 |
-| `./entities/drop.wav` | https://freesound.org/people/Planman/sounds/208111/ | CC0 |
-| `./temp/gore.wav` | https://freesound.org/people/MinecraftGamerLR/sounds/728695/ | CC-BY 4.0 |
-| `./temp/bones.wav` | https://freesound.org/people/cliftonmcarlson/sounds/392883/ | CC0 |
-=======
 | `./temp/mouth_pop.wav` | https://freesound.org/people/igaopuromalte/sounds/725453/ | Attribution 4 |
 | `./temp/puff.wav` | https://freesound.org/people/JustInvoke/sounds/446124/ | Attribution 4 |
 | `./temp/place.wav` | https://freesound.org/people/Planman/sounds/208111/ | CC0 |
@@ -28,4 +21,3 @@ This project uses the following external assets:
 | `./temp/squelch.wav` | https://freesound.org/people/primeval_polypod/sounds/159389/ | Attribution 3 |
 | `./temp/arcade_cancel.flac` | https://freesound.org/people/plasterbrain/sounds/464912/ | CC0 |
 | `./temp/cancel.wav` | https://freesound.org/people/Kagateni/sounds/571510/ | CC0 |
->>>>>>> beb42d04ed6a0801686ed9ca29e323c6916aae97