resolved conflict
changed name to ThreadListController