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
diff --git a/nyx_mode/QEMU-Nyx b/nyx_mode/QEMU-Nyx
index 92ed7cef..874fa033 160000
--- a/nyx_mode/QEMU-Nyx
+++ b/nyx_mode/QEMU-Nyx
@@ -1 +1 @@
-Subproject commit 92ed7cefc1bd043a1230ca74b263b484825c2655
+Subproject commit 874fa033d117a3e9931245cb9e82836a4abc0425
diff --git a/unicorn_mode/unicornafl b/unicorn_mode/unicornafl
index f607118f..f2cede37 160000
--- a/unicorn_mode/unicornafl
+++ b/unicorn_mode/unicornafl
@@ -1 +1 @@
-Subproject commit f607118fc10e5225da751385075792e24133a130
+Subproject commit f2cede37a75bbd4a9b9438f0277727b5d4620572