Merge to display workslist edit