Missed 2 conflicts 😄

Author: Face Kapow

src/kernel/kernel-main.cc

@@ -156,7 +156,6 @@ void runtime_rng_buf(void* const buf, const size_t size) {
 }
 
 void KernelMain::InitSystemBSP(void* mbt) {
-<<<<<<< HEAD
   // some musl libc init
   libc.threads_minus_1 = 0;
 

src/kernel/native-object.cc

@@ -336,15 +336,6 @@ NATIVE_FUNCTION(NativesObject, InitrdReadFileBuffer) {
   RT_ASSERT(buf);
   memcpy(buf, file.Data(), file.Size());
 
-  LOCAL_V8STRING(s_memory_range, "memoryRange");
-  LOCAL_V8STRING(s_io_range, "ioRange");
-  LOCAL_V8STRING(s_irq_range, "irqRange");
-  LOCAL_V8STRING(s_acpi, "acpi");
-  LOCAL_V8STRING(s_allocator, "allocator");
-  LOCAL_V8STRING(s_loader, "loader");
-  LOCAL_V8STRING(s_natives, "natives");
-  LOCAL_V8STRING(s_libsodium, "libsodium");
-
   // Let V8 manage buffer lifetime
   v8::Local<v8::ArrayBuffer> ab = v8::ArrayBuffer::New(iv8, buf, file.Size(),
     v8::ArrayBufferCreationMode::kInternalized);
@@ -388,20 +379,18 @@ NATIVE_FUNCTION(NativesObject, SystemInfo) {
     obj->Set(context, s_irq_counters, counters);
   }
 
-<<<<<<< HEAD
-    obj->Set(context, s_libsodium, (new LibsodiumObject())
-        ->BindToTemplateCache(th->template_cache())
-        ->GetInstance());
-
-    args.GetReturnValue().Set(obj);
-}
-=======
   {
     auto ev_count = static_cast<uint32_t>(th->thread_manager()->events_count());
     LOCAL_V8STRING(s_events_count, "eventsCount");
     obj->Set(context, s_events_count, v8::Uint32::NewFromUnsigned(iv8, ev_count));
   }
->>>>>>> 30abc903d2341089395161ae3c0a1336dae24ea7
+
+  {
+    LOCAL_V8STRING(s_libsodium, "libsodium");
+    obj->Set(context, s_libsodium, (new LibsodiumObject())
+       ->BindToTemplateCache(th->template_cache())
+       ->GetInstance());
+  }
 
   args.GetReturnValue().Set(obj);
 }