1 files changed, 8 insertions, 0 deletions
diff --git a/TODO.md b/TODO.md
index 9bdb2c55..3f8855a0 100644
--- a/TODO.md
+++ b/TODO.md
@@ -10,7 +10,15 @@
 
 ## Should
 
+<<<<<<< Updated upstream
  - add value_profile but only enable after 15 minutes without finds?
+=======
+ - afl-showmap -f support
+ - afl-fuzz multicore wrapper script
+ - UI revamp
+ - hardened_usercopy=0 page_alloc.shuffle=0
+ - add value_profile but only enable after 15 minutes without finds
+>>>>>>> Stashed changes
  - afl-crash-analysis
  - support persistent and deferred fork server in afl-showmap?
  - better autodetection of shifting runtime timeout values