flake8 said it doenst look nice

core/tests/test_export.py

@@ -97,13 +97,8 @@ class ExportInstanceTest(APITestCase):
         self.client = APIClient()
         self.client.force_login(user=self.data['reviewers'][0])
         self.response = self.client.get('/api/instance/export/',
-<<<<<<< HEAD
                                         data={'setPasswords': True,
                                               'selected_exam': self.data['exams'][0].exam_type_id})
-=======
-                                         data={'setPasswords': True,
-                                               'selected_exam': self.data['exams'][0].exam_type_id})
->>>>>>> 27c5fd7 (reverted changes to export tests as well)
 
     def test_can_access(self):
         self.assertEqual(status.HTTP_200_OK, self.response.status_code)