diff --git a/docs/upgrades/upgrade_7.7.5-7.7.6.pl b/docs/upgrades/upgrade_7.7.5-7.7.6.pl
index c9a213b6b..5d78c676f 100644
--- a/docs/upgrades/upgrade_7.7.5-7.7.6.pl
+++ b/docs/upgrades/upgrade_7.7.5-7.7.6.pl
@@ -166,7 +166,6 @@ sub installNotificationsSettings {
     $session->setting->add('inboxNotificationTemplateId', 'b1316COmd9xRv4fCI3LLGA');
 }
 
-<<<<<<< .mine
 sub installSMSUserProfileFields {
     my $session = shift;
     WebGUI::ProfileField->create(