xorg.conf duplicate entries help

After the 11 to 11.1 upgrade, my xorg.conf is messed up, I have three entries for my graphics card. The first is the one i believe worked before the upgrade (since it uses the nvidia driver) I don’t know how the other two got there, but I want to get rid of the other two and leave the one that works (and change it’s driver to nvidia).

I was just going to guess and check, but I thought maybe someone had some wisdom they could share on this topic (like a command to see which one is being used or something).

Section “Device”
Identifier “Device[0]”
Driver “nvidia”
VendorName “NVIDIA”
BoardName “GeForce 8400M GS”
Screen 0
EndSection

Section “Device”
Identifier “Videocard0”
Driver “nv”
VendorName “NVIDIA Corporation”
BoardName “GeForce 8400M GS”
EndSection

Section “Device”
Identifier “Videocard1”
Driver “nv”
VendorName “NVIDIA Corporation”
BoardName “GeForce 8400M GS”
BusID “PCI:1:0:0”
Screen 1
EndSection

You could have two entries if you are using a dual-head card with twinview enabled, but three? Do you have onboard video and a video card? If not, you can comment out the two last sections in xorg.conf.

so apparently it doesn’t matter which one is uncommented. Anytime I set the driver to nvidia instead of nv it says something about an unconfigured screen.

I used the nvidia one click install, what should I do?