# Conflicts: # js/views/conversation_view.js # package.json # ts/components/ConversationListItem.tsx # ts/components/conversation/ConversationHeader.tsx