Import conflict resoultion

[Lucas Goss]

Regan Heath wrote:
> Here is my current understanding of the problems and solutions proposed 
> to date. Comments are welcome, including "enough already! the horse is 
> dead!" ;)
> ...

Nice! Wiki'd!
http://www.prowiki.org/wiki4d/wiki.cgi?ImportConflictResolution

And linked from:
http://www.prowiki.org/wiki4d/wiki.cgi?ImportIssues

I added a section for supported solutions so you can put your name by 
the number you support (makes me feel like I'm signing a declaration 
of... independence or something, :) ).

Lucas