i just added this
Merge remote-tracking branch 'origin/master'
i modified txt.txt