.txt commit...
test1 modyfy...
Merge branch 'test1'

i just need to merge