Comment 8 for bug 165936

I've fixed this for importing (bug 168626). I haven't looked at copying yet, but it's likely that the clash-resolving functions could be moved to a separate file and used for that case too.