diff --git a/core-java/src/main/java/com/baeldung/string/StringHelper.java b/core-java/src/main/java/com/baeldung/string/StringHelper.java
index adf8d70531..ad2a0b3419 100644
--- a/core-java/src/main/java/com/baeldung/string/StringHelper.java
+++ b/core-java/src/main/java/com/baeldung/string/StringHelper.java
@@ -21,10 +21,6 @@ public class StringHelper {
     public static String removeLastCharRegexOptional(String s) {
         return Optional.ofNullable(s)
             .map(str -> str.replaceAll(".$", ""))
-<<<<<<< HEAD
             .orElse(s);
-=======
-            .orElse(null);
->>>>>>> refs/remotes/eugenp/master
     }
 }