Remove merge conflict markers left in target-i386/kvm.c.