diff --git a/lms/djangoapps/certificates/signals.py b/lms/djangoapps/certificates/signals.py
index 08215c8f62..98c249c451 100644
--- a/lms/djangoapps/certificates/signals.py
+++ b/lms/djangoapps/certificates/signals.py
@@ -52,7 +52,6 @@ def _update_cert_settings_on_pacing_change(sender, updated_course_overview, **kw
 @receiver(post_save, sender=CertificateWhitelist, dispatch_uid="append_certificate_whitelist")
 def _listen_for_certificate_whitelist_append(sender, instance, **kwargs):  # lint-amnesty, pylint: disable=missing-function-docstring, unused-argument
     course = CourseOverview.get_from_id(instance.course_id)  # lint-amnesty, pylint: disable=unused-variable
-
     if not auto_certificate_generation_enabled():
         return
 
@@ -70,6 +69,10 @@ def listen_for_passing_grade(sender, user, course_id, **kwargs):  # pylint: disa
     downstream signal from COURSE_GRADE_CHANGED
     """
 <<<<<<< HEAD
+<<<<<<< HEAD
+=======
+    course = CourseOverview.get_from_id(course_id)  # lint-amnesty, pylint: disable=unused-variable
+>>>>>>> Applied pylint-amnesty to certificates
 =======
     course = CourseOverview.get_from_id(course_id)  # lint-amnesty, pylint: disable=unused-variable
 >>>>>>> Applied pylint-amnesty to certificates