Tabbing through the edit conflict view demonstrates that the elements are not ordered well. It seems that they are added to two queues, so that tabbing through the entire page once will give you one set of elements, and then tabbing will wrap back to the beginning and will focus a second group of elements. It would be better if the tabbing worked predictably, so each tabbable element receives focus in the order which it appears in the page.
It's possible that we did this on purpose, so please check the design history and general accessibility guidelines. However, the outcome is still disconcerting, because a user would need to tab through the document twice in order to accomplish the basic use case of resolving a conflict and submitting.
A related problem is that, once you begin editing textbox content, the save and discard buttons have tab indexes *less than* the textbox, so you need to shift-tab out of the text box to save.