changed add_editors and add_conflict to use html.fromstring