# Conflicts: # extensions/ohif-cornerstone-extension/package.json # package.json # src/components/Header/Header.js # src/components/Labelling/LabellingFlow.js # src/components/OHIFLogo/OHIFLogo.js # src/connectedComponents/ConnectedPluginSwitch.js # src/connectedComponents/ToolbarRow.js # src/utils/getDefaultToolbarButtons.js # src/utils/getDefaultToolbarButtons.test.js # yarn.lock