discussion list view sorting early proto
merge conflicts