diff --git a/dspace-api/src/main/java/org/dspace/eperson/AccountServiceImpl.java b/dspace-api/src/main/java/org/dspace/eperson/AccountServiceImpl.java
index 61941d6181e0..e6f35e7bb7bc 100644
--- a/dspace-api/src/main/java/org/dspace/eperson/AccountServiceImpl.java
+++ b/dspace-api/src/main/java/org/dspace/eperson/AccountServiceImpl.java
@@ -101,15 +101,9 @@ protected AccountServiceImpl() {
      *
      * @param context DSpace context
      * @param email   Email address to send the registration email to
-<<<<<<< HEAD
-     * @throws java.sql.SQLException                   passed through.
-     * @throws java.io.IOException                     passed through.
-     * @throws javax.mail.MessagingException           passed through.
-=======
      * @throws java.sql.SQLException passed through.
      * @throws java.io.IOException passed through.
      * @throws jakarta.mail.MessagingException passed through.
->>>>>>> dspace-8.0
      * @throws org.dspace.authorize.AuthorizeException passed through.
      */
     @Override
@@ -138,15 +132,9 @@ public void sendRegistrationInfo(Context context, String email, List<UUID> group
      *
      * @param context DSpace context
      * @param email   Email address to send the forgot-password email to
-<<<<<<< HEAD
-     * @throws java.sql.SQLException                   passed through.
-     * @throws java.io.IOException                     passed through.
-     * @throws javax.mail.MessagingException           passed through.
-=======
      * @throws java.sql.SQLException passed through.
      * @throws java.io.IOException passed through.
      * @throws jakarta.mail.MessagingException passed through.
->>>>>>> dspace-8.0
      * @throws org.dspace.authorize.AuthorizeException passed through.
      */
     @Override