Fix merge conflicts and remove duplicate test

Resolve conflict in GridList.test.js and remove duplicate CollectionProgress.test.js.

Author: dannon

client/src/components/Grid/GridList.test.js

@@ -115,12 +115,8 @@ describe("GridList", () => {
         expect(testGrid.actions[0].handler).toHaveBeenCalledTimes(1);
         expect(testGrid.getData).toHaveBeenCalledTimes(1);
         expect(testGrid.getData.mock.calls[0]).toEqual([0, 25, "", "id", true]);
-<<<<<<< HEAD
-        expect(findAction.find("svg").exists()).toBeTruthy();
-=======
         // Icon component is stubbed, so we can't check for icon attribute
         // expect(findAction.find(`[icon='${testIcon}']`).exists()).toBeTruthy();
->>>>>>> c263e89c572 (Fix FilesDialog and GridList tests)
         await wrapper.vm.$nextTick();
         expect(wrapper.find("[data-description='grid title']").text()).toBe("Test");
         expect(wrapper.find("[data-description='grid cell 0-0']").text()).toBe("id-1");