Consolidate annotation editor