Hm, I could have sworn I've been in such edit conflicts on ANI. If it happens again, should I file a bugreport on that?
The automatic merging isn't very good, I think that's a known issue. I'm not sure how much it's meant to be able to cope with - I'll take a look at the code.