diff --git a/dspace-api/src/main/java/org/dspace/app/deduplication/utils/DedupUtils.java b/dspace-api/src/main/java/org/dspace/app/deduplication/utils/DedupUtils.java
index b4c29d8780c9..45b021e70ccd 100644
--- a/dspace-api/src/main/java/org/dspace/app/deduplication/utils/DedupUtils.java
+++ b/dspace-api/src/main/java/org/dspace/app/deduplication/utils/DedupUtils.java
@@ -267,7 +267,7 @@ public boolean matchExist(Context context, UUID itemID, UUID targetItemID, Integ
     @Override
     public boolean rejectAdminDups(Context context, UUID firstId, UUID secondId, Integer type)
             throws SQLException, AuthorizeException {
-        if (firstId == secondId) {
+        if (firstId.equals(secondId)) {
             return false;
         }
         if (!AuthorizeServiceFactory.getInstance().getAuthorizeService().isAdmin(context)) {
@@ -327,7 +327,7 @@ public boolean rejectAdminDups(Context context, UUID itemID, String signatureTyp
         boolean found = false;
         for (DSpaceObject item : dsi.getItems()) {
             if (item != null) {
-                if (item.getID() == itemID) {
+                if (item.getID().equals(itemID)) {
                     found = true;
                     break;
                 }
diff --git a/dspace-api/src/main/java/org/dspace/content/ItemServiceImpl.java b/dspace-api/src/main/java/org/dspace/content/ItemServiceImpl.java
index 9d83db016268..2811c22a0cc9 100644
--- a/dspace-api/src/main/java/org/dspace/content/ItemServiceImpl.java
+++ b/dspace-api/src/main/java/org/dspace/content/ItemServiceImpl.java
@@ -326,7 +326,7 @@ private Thumbnail retrieveThumbnail(Context context, Item item, String bundle,
             Optional<Bitstream> primaryBitstream = bundles.get(0).getBitstreams().stream().filter(bitstream -> {
                 return bitstream.getMetadata().stream().anyMatch(metadataValue -> {
                     if (metadataField != null) {
-                        return metadataValue.getMetadataField().getID() == metadataField.getID()
+                        return metadataValue.getMetadataField().getID().equals(metadataField.getID())
                             && metadataValue.getValue() != null
                             && metadataValue.getValue().equalsIgnoreCase(value);
                     } else {
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
diff --git a/dspace-api/src/main/java/org/dspace/submit/listener/MetadataListenerConstrain.java b/dspace-api/src/main/java/org/dspace/submit/listener/MetadataListenerConstrain.java
index 37ec63604385..496dab2018cd 100644
--- a/dspace-api/src/main/java/org/dspace/submit/listener/MetadataListenerConstrain.java
+++ b/dspace-api/src/main/java/org/dspace/submit/listener/MetadataListenerConstrain.java
@@ -63,7 +63,7 @@ public String getConstrainMetadataName(String metadataName) {
             constrainMetadata = this.metadata.get(metadataName);
             if (constrainMetadata == null) {
                 for (Map.Entry<String,String> entry : metadata.entrySet()) {
-                    if (entry.getValue() == metadataName) {
+                    if (entry.getValue().equals(metadataName)) {
                         constrainMetadata = entry.getKey();
                         break;
                     }
@@ -77,7 +77,7 @@ public String getConstrainMetadataName(String metadataName) {
     public boolean hasConstrain(String metadataName) {
         boolean hasConstrain = false;
         for (Map.Entry<String,String> entry : metadata.entrySet()) {
-            if (entry.getKey() == metadataName || entry.getValue() == metadataName) {
+            if (entry.getKey().equals(metadataName) || entry.getValue().equals(metadataName)) {
                 hasConstrain = true;
                 break;
             }