diff --git a/luprex/core/TODO b/luprex/core/TODO
index e93dc485..d8f0f169 100644
--- a/luprex/core/TODO
+++ b/luprex/core/TODO
@@ -1,8 +1,11 @@
-Calling out to external servers.
 
+Support unicode on output.
 Support ANSI escape sequences on output.
 
+Figure out something to do about global variables.
+
 Do something about std::cerr && std::cout once and for all.
 
-Fix math.random
+Fix math.random (?)
+
 
diff --git a/luprex/core/cpp/util.hpp b/luprex/core/cpp/util.hpp
index 4b515005..430a9401 100644
--- a/luprex/core/cpp/util.hpp
+++ b/luprex/core/cpp/util.hpp
@@ -26,13 +26,9 @@
 #include <utility>
 #include <algorithm>
 #include <string_view>
-<<<<<<< HEAD
-#include <limits>
-=======
-#include <cstdint>
 #include <limits>
 #include <iomanip>
->>>>>>> 4e754377ee4922940c37a20710314befeff0d84e
+// #include <cstdint>
 
 #include "luastack.hpp"
 #include "spookyv2.hpp"