Merge "editpage: Make TextConflictHelper::toEditContent private"