# Conflicts: # client/package-lock.json # client/src/components/dms-cdk-makes/dms-cdk-makes.component.jsx # client/src/components/dms-customer-selector/dms-customer-selector.component.jsx # client/src/pages/dms/dms.container.jsx # package-lock.json # package.json