diff --git a/src/test.txt b/src/test.txt
index 15561e7b..3cf068a0 100644
--- a/src/test.txt
+++ b/src/test.txt
@@ -1 +1 @@
-Merge pull request 'fix issue 274 and 355' (#376) from cb2-without-dataset into V20210910
+fix conflicts