diff --git a/README.md b/README.md
index ea0ebdf..9d76dbf 100644
--- a/README.md
+++ b/README.md
@@ -5,4 +5,8 @@ Management tools for a Pokémon Living Dex.
  - Code by [Posho](https://github.com/PoshoDev). 
  - Ripped sprites by [msikma](https://github.com/msikma) from [PokéSprite](http://msikma.github.io/pokesprite/).
  - [Non-sandboxed Filesystem](https://yellowafterlife.itch.io/gamemaker-nsfs) by [YAL](https://github.com/YellowAfterlife).
- - [CSV Manager](https://marketplace.yoyogames.com/assets/522/csv-manager) by [derme](https://github.com/derme302).
\ No newline at end of file
+<<<<<<< HEAD
+ - [CSV Manager](https://marketplace.yoyogames.com/assets/522/csv-manager) by [derme](https://github.com/derme302).
+=======
+ - [CSV Manager](https://marketplace.yoyogames.com/assets/522/csv-manager) by [derme](https://github.com/derme302).
+>>>>>>> e8314b37d8fc404a882b7e392838aad2398387d5