It might be worth asking the Editing team if improving the handling of edit conflicts is something that they have on their agenda or if they can add it next to their agenda for the next FY, or if this project would be a good GSOC/OPW project. James, can you comment? I know you're busy with VE and I'm not sure what your capacity and priorities are outside of VE.
Thanks! Pine