Merge "Make EditPage::incrementConflictStats protected"