Merge "EditPage: Extract some edit conflict code into EditConflictHelper"