diff --git a/src/rpn-branch.hpp b/src/rpn-branch.hpp
index d047c37..5d7ebf7 100644
--- a/src/rpn-branch.hpp
+++ b/src/rpn-branch.hpp
@@ -147,7 +147,6 @@ int rpn_repeat(branch& myobj)
     return ret;
 }
 
->>>>>>> #117, #116, #119: added while..repeat, added do..until tests, until in addition to until
 int rpn_start(branch& myobj)
 {
     int ret = -1;
diff --git a/test/04-branch.txt b/test/04-branch.txt
index 53598e4..efe416d 100644
--- a/test/04-branch.txt
+++ b/test/04-branch.txt
@@ -80,6 +80,7 @@ erase
 -> error should be 3
 erase
 
+<<<<<<< HEAD
 # ift (1)
 1 'ok' ift
 -> stack should be 'ok'