Comment 3 for bug 244980

Hi, this was probably caused by a merge from someone that had a file with unrelated ancestry and a different name, while you had removed your file - that would create a conflict like the one you saw.

I'm not sure there is a bug here, but perhaps we can think of some way to make the behaviour more transparent.