Update to feature fies

Update to draft conflicts feature and to prominent trailblocks feature