Fix merge conflicts and linting errors

__tests__/components/Breadcrumbs.test.jsx

@@ -53,7 +53,7 @@ describe('<Breadcrumb />', () => {
     ];
 
     routes.forEach(([location, crumbLength]) => {
-      const breadcrumbWrapper = mount(
+      breadcrumbWrapper = mount(
         <MemoryRouter initialEntries={[location]}>
           <Breadcrumbs
             breadcrumbConfig={config}
@@ -63,8 +63,6 @@ describe('<Breadcrumb />', () => {
 
       expect(breadcrumbWrapper.find('BreadcrumbItem')).toHaveLength(crumbLength);
       breadcrumbWrapper.unmount();
-    })
-
+    });
   });
-
 });

__tests__/components/Lookup.test.jsx

@@ -40,7 +40,7 @@ describe('<Lookup />', () => {
           data={mockData}
         />
       </I18nProvider>
-    );    
+    );
     const searchItem = wrapper.find('.pf-c-input-group__text#search');
     searchItem.first().simulate('click');
     wrapper.find('input[type="checkbox"]').simulate('change');