text merge ,fixes #1

the test of branch. just a test.