correct 1.txt (checkou merge)
add test.file
try merge
Merge branch 'delta'