diff --git a/arch/x86/new_intrin.c b/arch/x86/new_intrin.c
index b0ea4ad..99cd111 100644
--- a/arch/x86/new_intrin.c
+++ b/arch/x86/new_intrin.c
@@ -4,13 +4,13 @@
 
 bool cpu_supports_sse2(void)
 {
-    int k = __buildin_cpu_supports("sse2");
-    return k > 0 ? true : false
+  int k = __buildin_cpu_supports("sse2");
+  return k > 0 ? true : false
 }
 
 bool cpu_supports_sse(void)
 {
-    return __buildin_cpu_supports("sse") > 0 ? true : false;
+  return __buildin_cpu_supports("sse") > 0 ? true : false;
 }
 
 #endif
diff --git a/include/kernel/kconfig.h b/include/kernel/kconfig.h
index 7b4673b..ce832e8 100644
--- a/include/kernel/kconfig.h
+++ b/include/kernel/kconfig.h
@@ -14,6 +14,7 @@ extern "C" {
 //#define ENABLE_NETWORK
 
 typedef struct {
+<<<<<<< HEAD
   bool enable_debug;
   bool enable_fs;
   bool enable_ide;