fix email merge template issue

Author: Johnetordoff

framework/auth/views.py

@@ -832,7 +832,6 @@ def send_confirm_email(user, email, renew=False, external_id_provider=None, exte
         merge_target = OSFUser.objects.get(emails__address=email)
     except OSFUser.DoesNotExist:
         merge_target = None
-    merge_account_data = {}
     campaign = campaigns.campaign_for_user(user)
     # Choose the appropriate email template to use and add existing_user flag if a merge or adding an email.
     if external_id_provider and external_id:
@@ -845,11 +844,6 @@ def send_confirm_email(user, email, renew=False, external_id_provider=None, exte
             raise HTTPError(http_status.HTTP_400_BAD_REQUEST, data={})
     elif merge_target:
         # Merge account confirmation
-        merge_account_data = {
-            'merge_target_fullname': merge_target.fullname or merge_target.username,
-            'user_username': user.fullname,
-            'email': merge_target.email,
-        }
         notification_type = NotificationType.Type.USER_CONFIRM_MERGE
     elif user.is_active:
         # Add email confirmation
@@ -866,12 +860,14 @@ def send_confirm_email(user, email, renew=False, external_id_provider=None, exte
         subscribed_object=user,
         event_context={
             'user_fullname': user.fullname,
+            'user_username': user.username,
             'confirmation_url': confirmation_url,
             'can_change_preferences': False,
             'external_id_provider': external_id_provider,
             'osf_contact_email': settings.OSF_CONTACT_EMAIL,
             'osf_support_email': settings.OSF_SUPPORT_EMAIL,
-            **merge_account_data,
+            'merge_target_fullname': merge_target.fullname or merge_target.username,
+            'email': merge_target.email,
         },
     )