diff --git a/persistence-modules/hibernate-mapping/src/test/java/com/baeldung/hibernate/arraymapping/CustomArrayTypeMappingUnitTest.java b/persistence-modules/hibernate-mapping/src/test/java/com/baeldung/hibernate/arraymapping/CustomArrayTypeMappingUnitTest.java
index 0cada05fd6..02d9dbc59c 100644
--- a/persistence-modules/hibernate-mapping/src/test/java/com/baeldung/hibernate/arraymapping/CustomArrayTypeMappingUnitTest.java
+++ b/persistence-modules/hibernate-mapping/src/test/java/com/baeldung/hibernate/arraymapping/CustomArrayTypeMappingUnitTest.java
@@ -27,11 +27,7 @@ public class CustomArrayTypeMappingUnitTest {
             bootstrapData();
 
         } catch (HibernateException | IOException e) {
-<<<<<<< HEAD
             System.out.println("Can't connect to a PostgreSQL DB");
-=======
-
->>>>>>> 55e039bd3c7469ff8afa3183fb8d842489eb3634
         }
     }