当我运行git merge master时，我得到的是：
➜ billing git:(issue-103) git merge master
Auto-merging src/locales/en/translation.json
CONFLICT (content): Merge conflict in src/locales/en/translation.json
Removing src/client/pages/Shipments/scss/main.scss
Removing src/client/pages/Shipments/scss/blocks/_table.scss
CONFLICT (modify/delete): src/client/pages/Shipments/scss/blocks/_modal.scss deleted in master and modified in HEAD. Version HEAD of src/client/pages/Shipments/scss/blocks/_modal.scss left in tree.
Removing src/client/pages/Shipments/scss/blocks/_itemsTable.scss
CONFLICT (modify/delete): src/client/pages/Shipments/scss/blocks/_filtersBar.scss deleted in master and modified in HEAD. Version HEAD of src/client/pages/Shipments/scss/blocks/_filtersBar.scss left in tree.
Removing src/client/pages/Shipments/reducers/index.js
Auto-merging src/client/pages/Shipments/index.js
CONFLICT (content): Merge conflict in src/client/pages/Shipments/index.js
Removing src/client/pages/Shipments/containers/GraphQLQuery.js
Removing src/client/pages/Shipments/containers/GetShipmentsAddresses.js
CONFLICT (modify/delete): src/client/pages/Shipments/containers/GetShipments.js deleted in master and modified in HEAD. Version HEAD of src/client/pages/Shipments/containers/GetShipments.js left in tree.
Removing src/client/pages/Shipments/containers/GetAllShipmentTypes.js
Removing src/client/pages/Shipments/containers/GetAllShipmentStatuses.js
Removing src/client/pages/Shipments/containers/GetAllCouriers.js
Removing src/client/pages/Shipments/constants/ActionTypes.js
Removing src/client/pages/Shipments/actions/shipments.js
Removing src/client/pages/Shipments/actions/index.js
CONFLICT (modify/delete): src/client/pages/Shipments/TableToolbarComp.js deleted in master and modified in HEAD. Version HEAD of src/client/pages/Shipments/TableToolbarComp.js left in tree.
Removing src/client/pages/Shipments/TableItemsHeaders.js
Removing src/client/pages/Shipments/TableItemsHeader.js
Removing src/client/pages/Shipments/TableHeaders.js
CONFLICT (modify/delete): src/client/pages/Shipments/TableExpandedRowWrapper.js deleted in master and modified in HEAD. Version HEAD of src/client/pages/Shipments/TableExpandedRowWrapper.js left in tree.
Removing src/client/pages/Shipments/TableExpandedRow.js
Removing src/client/pages/Shipments/TableEmptyState.js
CONFLICT (modify/delete): src/client/pages/Shipments/ShipmentsTable.js deleted in master and modified in HEAD. Version HEAD of src/client/pages/Shipments/ShipmentsTable.js left in tree.
CONFLICT (modify/delete): src/client/pages/Shipments/FiltersModal.js deleted in master and modified in HEAD. Version HEAD of src/client/pages/Shipments/FiltersModal.js left in tree.
Automatic merge failed; fix conflicts and then commit the result.
如您所见，它将删除许多我需要的文件，这些文件在将master与分支issue-30合并之前就已提交。
奇怪的是，如果我转到master，则在我正在开发某些组件的shipments文件夹中是空的。
因此，不应删除所有显示Removing的文件。
那么，什么原因导致这些文件被删除？