# Conflicts: # package-lock.json # package.json # src/components/dialog/MessageHistoryDialog.tsx # src/components/list-contact/ListContactEventPanel.tsx
# Conflicts: # package-lock.json # package.json # src/components/dialog/MessageHistoryDialog.tsx # src/components/list-contact/ListContactEventPanel.tsx