diff --git a/__tests__/pages/Organizations/screens/Organization/Organization.test.jsx b/__tests__/pages/Organizations/screens/Organization/Organization.test.jsx
index b57c95d6f4..d7746c5838 100644
--- a/__tests__/pages/Organizations/screens/Organization/Organization.test.jsx
+++ b/__tests__/pages/Organizations/screens/Organization/Organization.test.jsx
@@ -1,15 +1,9 @@
 import React from 'react';
 import { mount } from 'enzyme';
-<<<<<<< HEAD
-import { MemoryRouter } from 'react-router-dom';	import { MemoryRouter } from 'react-router-dom';
-import { I18nProvider } from '@lingui/react';	import { I18nProvider } from '@lingui/react';
-import Organization from '../../../../../src/pages/Organizations/screens/Organization/Organization';	import Organization, { _Organization } from '../../../../../src/pages/Organizations/screens/Organization/Organization';
 
-=======
 import { MemoryRouter } from 'react-router-dom';
 import { I18nProvider } from '@lingui/react';
 import Organization, { _Organization } from '../../../../../src/pages/Organizations/screens/Organization/Organization';
->>>>>>> addresses PR issues
 
 describe('<OrganizationView />', () => {
   test('initially renders succesfully', () => {
diff --git a/src/pages/Organizations/screens/Organization/Organization.jsx b/src/pages/Organizations/screens/Organization/Organization.jsx
index b4887548ab..b3a92c77cb 100644
--- a/src/pages/Organizations/screens/Organization/Organization.jsx
+++ b/src/pages/Organizations/screens/Organization/Organization.jsx
@@ -71,14 +71,11 @@ class Organization extends Component {
       setBreadcrumb(data);
       this.setState({ organization: data, loading: false });
     } catch (error) {
-<<<<<<< HEAD
       handleHttpError(error) || this.setState({ error: true, loading: false });
-=======
       this.setState({ error: true });
     } finally {
       this.setState({ loading: false });
       this.checkLocation();
->>>>>>> addresses PR issues
     }
   }
 
@@ -226,10 +223,5 @@ class Organization extends Component {
     );
   }
 }
-<<<<<<< HEAD
-
 export default withNetwork(withRouter(Organization));
-=======
 export { Organization as _Organization };
-export default withRouter(Organization);
->>>>>>> addresses PR issues