Fix merge conflicts

Author: cslzchen

admin_tests/nodes/test_views.py

@@ -1119,7 +1119,6 @@ def test_file_is_removed_from_registration_osfstorage(self):
             name=registration_osfstorage.archive_folder_name
         ).children.exists()
         assert not self.registration_registered_from.files.exists()
-<<<<<<< HEAD
         remove_log = self.registration_registered_from.logs.filter(
             action=NodeLog.FILE_REMOVED,
             foreign_user=NodeLog.SUPPORT_USER_LABEL,
@@ -1237,7 +1236,6 @@ def test_update_registration_date(self):
             foreign_user=NodeLog.SUPPORT_USER_LABEL,
         ).latest('date')
         assert_support_attributed_log(log, self.admin_user)
-=======
 
 
 class TestEmbargoReportView(AdminTestCase):
@@ -1298,4 +1296,3 @@ def test_deleted_registration_embargo_excluded(self):
 
         context = self.view.get_context_data()
         assert embargo not in context['overdue_page']
->>>>>>> upstream/develop