Don't chain edit conflicts
Don't chain edit conflicts

If the user is manually resolving an edit conflict, then just let the edit through without
checking for further edit conflicts, as it's already annoying enough to deal with one.

Side note: Since the basetimestamp was never updated to that of the conflicting edit when
saving an edit conflict, I'm pretty sure it was actually impossible to save a conflicting edit
until now...

Majr-/SpriteEdit