diff --git a/luprex/core/cpp/util.hpp b/luprex/core/cpp/util.hpp
index a15beb4c..4b515005 100644
--- a/luprex/core/cpp/util.hpp
+++ b/luprex/core/cpp/util.hpp
@@ -26,9 +26,13 @@
 #include <utility>
 #include <algorithm>
 #include <string_view>
+<<<<<<< HEAD
+#include <limits>
+=======
 #include <cstdint>
 #include <limits>
 #include <iomanip>
+>>>>>>> 4e754377ee4922940c37a20710314befeff0d84e
 
 #include "luastack.hpp"
 #include "spookyv2.hpp"