diff --git a/sys/i386/i386_exec.c b/sys/i386/i386_exec.c
index 536ef29..dbeb76e 100644
--- a/sys/i386/i386_exec.c
+++ b/sys/i386/i386_exec.c
@@ -573,7 +573,7 @@
           break;
         case DT_DEBUG:
           break;
-        case DT_PLTRE:
+        case DT_PLTREL:
           break;
         case DT_JMPREL:
           break;
@@ -582,7 +582,7 @@
         case DT_RELSZ:
           break;
         case DT_RELENT:
-          if (dynp->d_un.d_val != sizeof(Elf_Rel))
+          if (dynp->d_un.d_val != sizeof(Elf32_Rel))
             kpanic("NOEXEC");
           break;
         case DT_PLTGOT:
diff --git a/sys/sys/idt.c b/sys/sys/idt.c
index 1e1febd..f69ec88 100644
--- a/sys/sys/idt.c
+++ b/sys/sys/idt.c
@@ -247,11 +247,7 @@
 
 void __int6(struct trapframe *frame) {
   die_if_kernel("invalid_op",frame,6);
-<<<<<<< HEAD
   //kprintf("tf_gs: 0x%X, tf_fs: 0x%X, tf_es: 0x%X, tf_ds: 0x%X\n", frame->tf_gs, frame->tf_fs, frame->tf_es, frame->tf_ds);
-=======
-  kprintf("tf_gs: 0x%X, tf_fs: 0x%X, tf_es: 0x%X, tf_ds: 0x%X\n", frame->tf_gs, frame->tf_fs, frame->tf_es, frame->tf_ds);
->>>>>>> branch 'master' of http://Git.BrainChurts.com:8080/git/MrOlsen/UbixOS.git
   //kpanic( "int6: Invalid opcode! [%i:0x%X:0x%X]\n", _current->id, _current->tss.eip, frame->tf_eip );
   endTask( _current->id );
   sched_yield();