diff --git a/src/zabapgit.prog.abap b/src/zabapgit.prog.abap
index 48111b25a..e0d51ae6d 100644
--- a/src/zabapgit.prog.abap
+++ b/src/zabapgit.prog.abap
@@ -3,7 +3,7 @@ REPORT zabapgit LINE-SIZE 100.
 * See http://www.abapgit.org
 
 CONSTANTS: gc_xml_version  TYPE string VALUE 'v1.0.0',      "#EC NOTEXT
-           gc_abap_version TYPE string VALUE 'v1.15.12'.    "#EC NOTEXT
+           gc_abap_version TYPE string VALUE 'v1.15.13'.    "#EC NOTEXT
 
 ********************************************************************************
 * The MIT License (MIT)
diff --git a/src/zabapgit_page_merge.prog.abap b/src/zabapgit_page_merge.prog.abap
index f946e74b9..1936c928c 100644
--- a/src/zabapgit_page_merge.prog.abap
+++ b/src/zabapgit_page_merge.prog.abap
@@ -188,6 +188,7 @@ CLASS lcl_merge IMPLEMENTATION.
 * added in source
         _from_source.
         <ls_result>-sha1 = <ls_source>-sha1.
+        CONTINUE.
       ELSEIF lv_found_source = abap_false.
 * added in target
         <ls_result>-sha1 = <ls_target>-sha1.
@@ -200,7 +201,10 @@ CLASS lcl_merge IMPLEMENTATION.
       IF lv_found_source = abap_false
           OR lv_found_target = abap_false
           OR lv_found_common = abap_false.
-        _raise 'merge conflict, not found anywhere'.
+        CLEAR gs_merge-result.
+        gs_merge-conflict = |{ <ls_file>-name
+          } merge conflict, not found anywhere|.
+        RETURN.
       ENDIF.
 
       IF <ls_target>-sha1 = <ls_source>-sha1.