workingsetsort -> panelistsort, panelistview -> panelistview
resolve conflicts