From 8c6899589d7cba8b670baf0643c2463543158d06 Mon Sep 17 00:00:00 2001
From: Theron <tspiegl@gmail.com>
Date: Mon, 20 Jan 2020 18:38:21 -0600
Subject: [PATCH] todo

---
 README.md | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/README.md b/README.md
index 8733507..85b0883 100644
--- a/README.md
+++ b/README.md
@@ -38,11 +38,7 @@ The code aims to follow the explanations from the [NES dev wiki](https://wiki.ne
 
 ## To do:
 
-<<<<<<< HEAD
 - Fix any bugs with mappers 0-4 and improve mapper 5 (MMC3)
-=======
-- Find any bugs with mappers 0-3 and improve mapper 4 (MMC3)
->>>>>>> c2e7b00ab09feb4a49a7baebad58fcf243f5f450
 
 - DMC audio channel, high- and low-pass filters