diff --git a/kernel/branches/net/drivers/RTL8139.asm b/kernel/branches/net/drivers/RTL8139.asm
index 866e5aed72..d481706ac3 100644
--- a/kernel/branches/net/drivers/RTL8139.asm
+++ b/kernel/branches/net/drivers/RTL8139.asm
@@ -283,11 +283,7 @@ align 4
 proc service_proc stdcall, ioctl:dword
 
 	mov	edx, [ioctl]
-<<<<<<< .mine
 	mov	eax, [IOCTL.io_code]
-=======
-	mov	eax, [edx+IOCTL.io_code]
->>>>>>> .r1471
 
 ;------------------------------------------------------